From f384b7bc097e08197d45e25760260ddb67b75fc5 Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Wed, 21 Mar 2018 02:53:14 +0300
Subject: [PATCH] fix merge

---
 README.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/README.md b/README.md
index 58770e68..9b0dbe5f 100755
--- a/README.md
+++ b/README.md
@@ -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