summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.pinerc10
1 files changed, 8 insertions, 2 deletions
diff --git a/.pinerc b/.pinerc
index 228c87a..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=
@@ -160,7 +164,7 @@ character-set=
editor=
# Specifies the program invoked by ^T in the Composer.
-speller=
+speller=/usr/bin/ispell
# Specifies the column of the screen where the composer should wrap.
composer-wrap-column=
@@ -318,7 +322,7 @@ address-book=
global-address-book=
# Set by Pine; controls beginning-of-month sent-mail pruning.
-last-time-prune-questioned=119.10
+last-time-prune-questioned=109.10
# Set by Pine; controls display of "new version" message.
last-version-used=6.00
@@ -570,6 +574,8 @@ index-from-background-color=
index-opening-foreground-color=
index-opening-background-color=
+# LDAP servers for looking up addresses.
+
# WebAlpine index table row height
wp-indexheight=