From 87e9819576e1f4c9cf8778938ab8fcce970b493f Mon Sep 17 00:00:00 2001
From: Maxim Rusak <mak-rusak@yandex.ru>
Date: Thu, 3 Sep 2015 14:31:07 +0300
Subject: [PATCH] repair menu bug

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

diff --git a/README.md b/README.md
index 835afc7..4270bcf 100644
--- a/README.md
+++ b/README.md
@@ -82,12 +82,8 @@ A curated list of awesome Python frameworks, libraries and software. Inspired by
     - [Algorithms and Design Patterns](#algorithms-and-design-patterns)
     - [Editor Plugins](#editor-plugins)
     - [IDEs](#ides)
-<<<<<<< HEAD
 - [Services](#services)
     - [Cloud continuous integration](#cloud-continuous-integration)
-=======
-    - [Chat](#chat)
->>>>>>> upstream/master
 - [Resources](#resources)
     - [Websites](#websites)
     - [Weekly](#weekly)