diff options
| author | Bastien <bzg@gnu.org> | 2020-12-16 10:42:17 +0100 |
|---|---|---|
| committer | Bastien <bzg@gnu.org> | 2020-12-16 10:42:17 +0100 |
| commit | b9f92831bb0aa7e36f026736354f0ddbced5e10d (patch) | |
| tree | a06f6209a015ac1d0e2724b02934ac00f685004e | |
| parent | b1dc45424212031b451a568e5ea4938585aa6edb (diff) | |
| parent | 86af7e0c2ffe91e301b86b998f3eda789ad8fa28 (diff) | |
| download | org-mode-b9f92831bb0aa7e36f026736354f0ddbced5e10d.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/org.el b/lisp/org.el index 6720655..9bb7e29 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -8,7 +8,11 @@ ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: https://orgmode.org +<<<<<<< HEAD ;; Version: 9.5-dev +======= +;; Version: 9.4.3 +>>>>>>> maint ;; This file is part of GNU Emacs. ;; @@ -21248,8 +21252,4 @@ Started from `gnus-info-find-node'." (run-hooks 'org-load-hook) -;; Local variables: -;; generated-autoload-file: "org-loaddefs.el" -;; End: - ;;; org.el ends here |