diff options
author | Bastien <bzg@gnu.org> | 2020-12-16 10:42:39 +0100 |
---|---|---|
committer | Bastien <bzg@gnu.org> | 2020-12-16 10:42:39 +0100 |
commit | 11d186a7014648600be4973b75a6d407aef1c6e0 (patch) | |
tree | 8c409c872384b5c9b6bf43211077ccc2633b648e | |
parent | b9f92831bb0aa7e36f026736354f0ddbced5e10d (diff) | |
download | org-mode-11d186a7014648600be4973b75a6d407aef1c6e0.tar.gz |
Fix previous commit
-rw-r--r-- | lisp/org.el | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lisp/org.el b/lisp/org.el index 9bb7e29..2f34aae 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -8,11 +8,7 @@ ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: https://orgmode.org -<<<<<<< HEAD ;; Version: 9.5-dev -======= -;; Version: 9.4.3 ->>>>>>> maint ;; This file is part of GNU Emacs. ;; |