Fixed merge hell

Browse Source

...

This commit is contained in:

Dreaded_X

2015-08-28 12:26:05 +02:00

parent 2b716f0353

commit b9250e2244

2 changed files with 2 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

nvim/.nvim/plugged/supertab

Submodule nvim/.nvim/plugged/supertab updated: 3d1af98f51...c8bfeceb1f

2

nvim/.nvim/plugged/vim-snippets

Submodule nvim/.nvim/plugged/vim-snippets updated: 21c7f20520...8a501edad8