mirror/php-flextype
1
0
Fork 0
mirror of https://github.com/flextype/flextype.git synced 2025-08-12 08:04:05 +02:00
Code Issues Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
Awilum
2018-03-21 02:53:14 +03:00
parent a6285286d8
commit f384b7bc09
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -1,8 +1,3 @@
<<<<<<< HEAD
<p align="center">
<img src="https://github.com/rawilum/rawilum/blob/dev/rawilum-logo-big.jpg?raw=true" alt="Rawilum" width="40%" height="40%" />
</p>
=======
# Flextype
![version](https://img.shields.io/badge/version-0.1.0-brightgreen.svg?style=flat-square "Version")
[![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://github.com/flextype/flextype/blob/master/LICENSE.txt)
@@ -45,4 +40,3 @@ composer create-project flextype/flextype
## License
See [LICENSE](https://github.com/flextype/flextype/blob/master/LICENSE.md)
>>>>>>> origin/dev