X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/0ee596c5c5e11fc79598407eaf22f83d279f7e9e..HEAD:/.vim/ftplugin/mail.vim?ds=sidebyside

diff --git a/.vim/ftplugin/mail.vim b/.vim/ftplugin/mail.vim
index cdecab22..94a3c44f 100644
--- a/.vim/ftplugin/mail.vim
+++ b/.vim/ftplugin/mail.vim
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 setlocal textwidth=68
 setlocal formatoptions-=o
 setlocal formatoptions-=r
@@ -217,6 +216,3 @@ autocmd BufWritePre <buffer> call WriteMailBackup()
 
 let g:markdown_in_mail = 1
 runtime! ftplugin/markdown.vim
-=======
-packadd! lbdbq
->>>>>>> 733463ee (move lbdbq package to mail ftplugin)