1 files changed, 0 insertions, 4 deletions

diff --git a/.pinerc b/.pinerc
index 17d4efa..14ab65b 100644
--- a/.pinerc
+++ b/.pinerc
@@ -81,11 +81,7 @@ initial-keystroke-list=
 default-composer-hdrs=
 
 # Add these customized headers (and possible default values) when composing
-<<<<<<< HEAD:.pinerc
 customized-hdrs=Reply-To:
-=======
-customized-hdrs=Reply-To
->>>>>>> ff11cadeffc57a92ae16e460188e579d03de1753:.pinerc
 
 # When viewing messages, include this list of headers
 viewer-hdrs=