Merge branch 'maint'

2021-03-28 17:54:17 +02:00 · 2021-03-28 17:54:17 +02:00 · a169bdde3b
parent 7a62a4d325 287af207fe
commit a169bdde3b
1 changed files with 4 additions and 0 deletions
--- a/lisp/org.el
+++ b/lisp/org.el
@ -9,7 +9,11 @@
 ;; Homepage: https://orgmode.org
 ;; Package-Requires: ((emacs "24.3"))

+<<<<<<< HEAD
 ;; Version: 9.5-dev
+=======
+;; Version: 9.4.5
+>>>>>>> maint

 ;; This file is part of GNU Emacs.
 ;;