mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-21 21:19:23 +00:00
Fix merge conflict.
This commit is contained in:
parent
68c5a2f840
commit
c4cad9f80b
|
@ -209,13 +209,8 @@ identifier."
|
|||
|
||||
;;; Version
|
||||
|
||||
<<<<<<< HEAD
|
||||
(defvaralias 'org-version 'org-release)
|
||||
=======
|
||||
(defconst org-version "7.8.10"
|
||||
"The version number of the file org.el.")
|
||||
|
||||
>>>>>>> maint
|
||||
;;;###autoload
|
||||
(defun org-version (&optional here)
|
||||
"Show the org-mode version in the echo area.
|
||||
|
|
Loading…
Reference in a new issue