From b58a6bb5b6e9d7cf451eecde847b35a6e5f98639 Mon Sep 17 00:00:00 2001
From: Bryan Newbold <bnewbold@animus.robocracy.org>
Date: Fri, 30 Oct 2009 18:00:42 -0700
Subject: fix merge, ugh

---
 .pinerc | 4 ----
 1 file changed, 4 deletions(-)

(limited to '.pinerc')

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=
-- 
cgit v1.2.3