fire merge conflict

2017-12-22 21:10:14 +01:00
parent 6e9f4a0534 fdc5c28da7
commit 313903cb83
2 changed files with 5 additions and 3 deletions
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -109,6 +109,8 @@ Plugin 'VundleVim/Vundle.vim'
 "Interfaces
 Plugin 'Shougo/unite.vim'
 Plugin 'mhinz/vim-startify'
+"Arduino
+Plugin 'z3t0/arduvim'

 "Utilities
 Plugin 'Shougo/vimfiler.vim'