diff options
author | Urbain Vaes <urbain@vaes.uk> | 2015-03-05 17:52:27 +0000 |
---|---|---|
committer | Urbain Vaes <urbain@vaes.uk> | 2015-03-05 17:52:27 +0000 |
commit | 0c66cb2c416e37338d2af2ae6ba484fed38f3916 (patch) | |
tree | 1728a33f29b5b29c394a76d93f8bca3cabc244be /nvim/after/syntax | |
parent | 862eeacabcfb35d709d5cc4ac964c92420c69b02 (diff) | |
parent | 808d4e68bc94826edd020cb5b498bc547f2e12f2 (diff) |
fixing merge conflict
Diffstat (limited to 'nvim/after/syntax')
0 files changed, 0 insertions, 0 deletions