ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix left-over merge conflict

This commit is contained in:
Bastien Guerry 2014-02-05 16:33:24 +01:00
parent 13b5123da1
commit 7eb570b860
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/lisp/ox-koma-letter.el
View File

@ -258,13 +258,9 @@ This option can also be set with the OPTIONS keyword, e.g.:
:group 'org-export-koma-letter)
(defcustom org-koma-letter-use-backaddress nil
<<<<<<< HEAD
"Non-nil prints return address in line above to address.
This option can also be set with the OPTIONS keyword, e.g.:
\"backaddress:t\"."
=======
"Print return address in line above to address."
>>>>>>> maint
:group 'org-export-koma-letter
:type 'boolean)