From 507b8776082bc89b2cabb779aff9ca9f4943ebbe Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@madduck.net>
Date: Thu, 10 Apr 2025 13:03:14 +0200
Subject: [PATCH] Remove conflict markers accidentally checked in

---
 .vim/ftplugin/mail.vim | 4 ----
 1 file changed, 4 deletions(-)

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)
-- 
2.39.5