]> git.madduck.net Git - etc/vim.git/blobdiff - .vim/ftplugin/mail.vim

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / etc / vim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Remove conflict markers accidentally checked in
[etc/vim.git] / .vim / ftplugin / mail.vim
diff --git a/.vim/ftplugin/mail.vim b/.vim/ftplugin/mail.vim
index cdecab22df2f60a93e7f0cc4bee880f771436f54..94a3c44f62e4730ed2851f2c960ab17996dda809 100644 (file)
--- a/.vim/ftplugin/mail.vim
+++ b/.vim/ftplugin/mail.vim
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 setlocal textwidth=68
 setlocal formatoptions-=o
 setlocal formatoptions-=r
 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
 
 let g:markdown_in_mail = 1
 runtime! ftplugin/markdown.vim
-=======
-packadd! lbdbq
->>>>>>> 733463ee (move lbdbq package to mail ftplugin)
vim configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.