Merge branch 'master' of https://github.com/daa84/neovim-gtk

2017-03-07 14:36:46 +03:00 · 2017-03-07 14:36:46 +03:00 · 7d86395e87
commit 7d86395e87
parent df496e2d27 6d41ac6fd8
1 changed files with 0 additions and 5 deletions
--- 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')
 ```