Permalink
Browse files

fix typo

  • Loading branch information...
2 parents f5501ff + 93f05eb commit dd34b4da72b067f9c035478cd79ce4430e30ae56 Carl Hayter committed Nov 30, 2011
Showing with 5 additions and 0 deletions.
  1. +5 −0 vimrc
View
5 vimrc
@@ -33,8 +33,13 @@ nmap <leader>l :set list!<CR>
if &encoding == 'latin1'
set listchars=tab:~\ ,eol:$ " ▸:U+25b8 ¬:U+00ac
else
+<<<<<<< HEAD
if has("multi_byte")
if &encoding == 'utf-8'
+=======
+ if has("multibyte")
+ if &encoding == 'utf-8')
+>>>>>>> 93f05eb75c18ba97c75e32f79ffe683a57afefe1
set listchars=tab:▸\ ,eol " ▸:U+25b8 ¬:U+00ac
endif
else

0 comments on commit dd34b4d

Please sign in to comment.