mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-20 23:18:35 +00:00
org-exp-blocks.el (org-ditaa-jar-path): Fix merge conflict.
* org-exp-blocks.el (org-ditaa-jar-path): Fix merge conflict.
This commit is contained in:
parent
ba249353d3
commit
da24a0131f
|
@ -233,7 +233,9 @@ which defaults to the value of `org-export-blocks-witheld'."
|
||||||
(expand-file-name
|
(expand-file-name
|
||||||
"../contrib"
|
"../contrib"
|
||||||
(file-name-directory (find-library-name "org")))))))
|
(file-name-directory (find-library-name "org")))))))
|
||||||
"Path to the ditaa jar executable.")
|
"Path to the ditaa jar executable."
|
||||||
|
:group 'org-babel
|
||||||
|
:type 'string)
|
||||||
|
|
||||||
(defvar org-export-current-backend) ; dynamically bound in org-exp.el
|
(defvar org-export-current-backend) ; dynamically bound in org-exp.el
|
||||||
(defun org-export-blocks-format-ditaa (body &rest headers)
|
(defun org-export-blocks-format-ditaa (body &rest headers)
|
||||||
|
|
Loading…
Reference in a new issue