branch: externals/org
commit b9f92831bb0aa7e36f026736354f0ddbced5e10d
Merge: b1dc454 86af7e0
Author: Bastien <b...@gnu.org>
Commit: Bastien <b...@gnu.org>
Merge branch 'maint'
---
lisp/org.el | 8 ++++----
1 file 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
