branch: externals/org
commit 11d186a7014648600be4973b75a6d407aef1c6e0
Author: Bastien <b...@gnu.org>
Commit: Bastien <b...@gnu.org>
Fix previous commit
---
lisp/org.el | 4 ----
1 file changed, 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.
;;
