diff options
| author | Bryan Newbold <bnewbold@animus.robocracy.org> | 2009-10-30 17:59:04 -0700 |
|---|---|---|
| committer | Bryan Newbold <bnewbold@animus.robocracy.org> | 2009-10-30 17:59:04 -0700 |
| commit | 7709022690abb51740fc10caf6cdb897783d310b (patch) | |
| tree | 3539c1bf7bbd109143e116fb7b2386db63602cf2 /.pinerc | |
| parent | 4360e42c1c5e9dc6edc85ccd26317776fc1625a5 (diff) | |
| parent | ff11cadeffc57a92ae16e460188e579d03de1753 (diff) | |
| download | openwrt-repro-7709022690abb51740fc10caf6cdb897783d310b.tar.gz openwrt-repro-7709022690abb51740fc10caf6cdb897783d310b.zip | |
Merge branch 'master' of /srv/git/dotfiles into animus
Conflicts:
.pinerc
Diffstat (limited to '.pinerc')
| -rw-r--r-- | .pinerc | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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= |