mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-08-21 21:19:23 +00:00
Code Releases Activity

Fix merge conflict.

Browse source
This commit is contained in:
Bastien Guerry 2012-05-16 23:46:36 +02:00
parent 68c5a2f840
commit c4cad9f80b
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/org.el
View file

@ -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.