diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-04-19 21:31:30 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-04-19 21:31:30 +0200 |
| commit | b2411769cfa3bd5267b08bb266ac502ec58a786e (patch) | |
| tree | 86a1980ae61166a4415b110d579e349c7b7fd183 | |
| parent | dbda42010c27cc1439d328d39541a6411b45cd2e (diff) | |
| parent | 21ef130752bdfb0ae841d53dd1458b5a505236af (diff) | |
| download | org-mode-b2411769cfa3bd5267b08bb266ac502ec58a786e.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/ox-odt.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el index e0c87a0..d996689 100644 --- a/lisp/ox-odt.el +++ b/lisp/ox-odt.el @@ -178,7 +178,7 @@ and `org-odt-data-dir'.") (eval-when-compile (and (boundp 'org-odt-data-dir) org-odt-data-dir ; see make install (expand-file-name "./styles/" org-odt-data-dir))) - (expand-file-name "../../etc/styles/" org-odt-lib-dir) ; git + (expand-file-name "../etc/styles/" org-odt-lib-dir) ; git (expand-file-name "./etc/styles/" org-odt-lib-dir) ; elpa (expand-file-name "./org/" data-directory) ; system ) |