diff options
| author | Bryan Newbold <bnewbold@animus.robocracy.org> | 2009-10-30 18:00:42 -0700 |
|---|---|---|
| committer | Bryan Newbold <bnewbold@animus.robocracy.org> | 2009-10-30 18:00:42 -0700 |
| commit | b58a6bb5b6e9d7cf451eecde847b35a6e5f98639 (patch) | |
| tree | be91138046e39db02beb0e44d3207c026fe4498e | |
| parent | 7709022690abb51740fc10caf6cdb897783d310b (diff) | |
| download | openwrt-repro-b58a6bb5b6e9d7cf451eecde847b35a6e5f98639.tar.gz openwrt-repro-b58a6bb5b6e9d7cf451eecde847b35a6e5f98639.zip | |
fix merge, ugh
| -rw-r--r-- | .pinerc | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -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= |