summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJulien Valroff <julien@kirya.net>2010-09-04 15:40:17 +0200
committerJulien Valroff <julien@kirya.net>2010-09-04 15:40:17 +0200
commit343132ec7fff4dd390beadfff6f376168e9ae028 (patch)
tree0be1abb91fe3434cf23566f1fc360e76d856e57b /debian
parentcd56a623d78e41780fe06f3e2446847f190ed7ce (diff)
Don't pass --three-way option to ucf
Diffstat (limited to 'debian')
-rw-r--r--debian/mailgraph.postinst2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/mailgraph.postinst b/debian/mailgraph.postinst
index 652fb6c..4b73ef3 100644
--- a/debian/mailgraph.postinst
+++ b/debian/mailgraph.postinst
@@ -33,7 +33,7 @@ case "$1" in
sed -i -re "s@^(${foo%=*}=).*@\1\"${RET}\"@" "$tempfile"
done
- ucf --three-way --debconf-ok ${tempfile} /etc/default/mailgraph
+ ucf --debconf-ok ${tempfile} /etc/default/mailgraph
ucfr mailgraph /etc/default/mailgraph
rm -f ${tempfile}
;;