From 6d41ac6fd89a1cb13e77f2fe445e5682a44981ca Mon Sep 17 00:00:00 2001
From: daa84 <andrey.dubravin@gmail.com>
Date: Tue, 7 Mar 2017 14:54:08 +0400
Subject: [PATCH] Update README.md

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

diff --git a/README.md b/README.md
index dc81376..6479d97 100644
--- a/README.md
+++ b/README.md
@@ -2,12 +2,7 @@
 GTK ui for neovim written in rust using gtk-rs bindings. 
 
 ## Font settings
-<<<<<<< HEAD
 To setup font add next line to *ginit.vim*
-```
-=======
-To setup font call:
 ```vim
->>>>>>> ebade2ecf3c7b66d4bdbd7f833ad2a40de19e292
 call rpcnotify(1, 'Gui', 'Font', 'DejaVu Sans Mono 12')
 ```