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

2017-03-07 13:52:56 +03:00 · 2017-03-07 13:52:56 +03:00 · a9adeb648f
parent 714b6059f1 ebade2ecf3
commit a9adeb648f
1 changed files with 5 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -2,7 +2,12 @@
 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')
 ```