mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2025-01-22 19:47:07 +00:00
Code

lisp/org.el: Fix previous merge commit

Browse Source
This commit is contained in:
Bastien 2021-03-28 17:54:50 +02:00
parent a169bdde3b
commit 05277f5caf
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/org.el
View File

@ -9,11 +9,7 @@
;; 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.
;;