forked from mirrors/org-mode
Fix left-over merge conflict
This commit is contained in:
parent
13b5123da1
commit
7eb570b860
|
@ -258,13 +258,9 @@ This option can also be set with the OPTIONS keyword, e.g.:
|
||||||
:group 'org-export-koma-letter)
|
:group 'org-export-koma-letter)
|
||||||
|
|
||||||
(defcustom org-koma-letter-use-backaddress nil
|
(defcustom org-koma-letter-use-backaddress nil
|
||||||
<<<<<<< HEAD
|
|
||||||
"Non-nil prints return address in line above to address.
|
"Non-nil prints return address in line above to address.
|
||||||
This option can also be set with the OPTIONS keyword, e.g.:
|
This option can also be set with the OPTIONS keyword, e.g.:
|
||||||
\"backaddress:t\"."
|
\"backaddress:t\"."
|
||||||
=======
|
|
||||||
"Print return address in line above to address."
|
|
||||||
>>>>>>> maint
|
|
||||||
:group 'org-export-koma-letter
|
:group 'org-export-koma-letter
|
||||||
:type 'boolean)
|
:type 'boolean)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue