From 24f48ce413b9ce6dd6ee5a19a77212346b2f0b33 Mon Sep 17 00:00:00 2001
From: Mattia Astorino <astorino.mattia@gmail.com>
Date: Tue, 12 Feb 2019 11:00:14 +0100
Subject: [PATCH] Update README.md

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

diff --git a/README.md b/README.md
index 941be67..7cb11e5 100644
--- a/README.md
+++ b/README.md
@@ -23,10 +23,6 @@ The most epic theme meets Visual Studio Code. You can help by reporting issues [
   - [Contributors](#contributors)
   - [Backers](#backers)
   - [Sponsors](#sponsors)
-<<<<<<< HEAD
-  - [Disabling/enabling file icons auto-applying](#disablingenabling-file-icons-auto-applying)
-=======
->>>>>>> develop
   - [Override theme colors](#override-theme-colors)
     - [Color Scheme override](#color-scheme-override)
 - [- Disabling/enabling file icons auto-applying](#disablingenabling-file-icons-auto-applying)