1 files changed, 4 insertions, 0 deletions
diff --git a/.pinerc b/.pinerc
index 14ab65b..17d4efa 100644
--- a/.pinerc
+++ b/.pinerc
@@ -81,7 +81,11 @@ 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=