From e74cb52ab55cbcf45dacd61fa5cf2921de416f09 Mon Sep 17 00:00:00 2001 From: Leandro Freitas Date: Thu, 2 Jun 2011 19:28:02 -0300 Subject: [PATCH] Merged with master --- ftplugin/todo.vim | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ftplugin/todo.vim b/ftplugin/todo.vim index 7cc586d..c8c853b 100644 --- a/ftplugin/todo.vim +++ b/ftplugin/todo.vim @@ -8,7 +8,6 @@ if exists("g:loaded_todo") endif " Stop breaking lines automatically -<<<<<<< HEAD set textwidth=0 set wrapmargin=0 @@ -56,7 +55,3 @@ set wrapmargin=0 "let &cpo = s:save_cpo let g:loaded_todo = 1 -======= -setlocal textwidth=0 -setlocal wrapmargin=0 ->>>>>>> c53c15dc2ca63f8b92faa665c8f4187a19487425