From da24a0131f852ebede009cca808150e9ab3d70e5 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 20 Mar 2012 03:18:50 +0100 Subject: [PATCH] org-exp-blocks.el (org-ditaa-jar-path): Fix merge conflict. * org-exp-blocks.el (org-ditaa-jar-path): Fix merge conflict. --- lisp/org-exp-blocks.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/org-exp-blocks.el b/lisp/org-exp-blocks.el index b2fd4a792..afe36d23c 100644 --- a/lisp/org-exp-blocks.el +++ b/lisp/org-exp-blocks.el @@ -233,7 +233,9 @@ which defaults to the value of `org-export-blocks-witheld'." (expand-file-name "../contrib" (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 (defun org-export-blocks-format-ditaa (body &rest headers) -- 2.11.4.GIT