ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

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

4
lisp/org.el
View File

@ -9,7 +9,11 @@
;; Homepage: https://orgmode.org ;; Homepage: https://orgmode.org
;; Package-Requires: ((emacs "24.3")) ;; Package-Requires: ((emacs "24.3"))
<<<<<<< HEAD
;; Version: 9.5-dev ;; Version: 9.5-dev
=======
;; Version: 9.4.5
>>>>>>> maint
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
;; ;;