From 19cc3135cdcc775a6492f6c159eb833eb654f9df Mon Sep 17 00:00:00 2001
From: Muljayan <muljayansj@gmail.com>
Date: Mon, 8 Oct 2018 10:27:11 +0530
Subject: [PATCH] resolved conflicts

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

diff --git a/README.md b/README.md
index 2661de5..36066a2 100644
--- a/README.md
+++ b/README.md
@@ -417,10 +417,6 @@ To enable Emmet support in .twig files, you'll need to have the following in you
 | `cp→`   | `const { } = this.props`                            |
 | `cs→`   | `const { } = this.state`                            |
 
-<<<<<<< HEAD
-
-=======
->>>>>>> ebb7619a9fe46cf814cec4555772653dc66bc8b8
 ### [Gi](https://marketplace.visualstudio.com/items?itemName=rubbersheep.gi)
 > Generating .gitignore files made easy.