[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org 05277f5 2/2: lisp/org.el: Fix previous merge commit
|
From: |
ELPA Syncer |
|
Subject: |
[elpa] externals/org 05277f5 2/2: lisp/org.el: Fix previous merge commit |
|
Date: |
Sun, 28 Mar 2021 11:57:15 -0400 (EDT) |
branch: externals/org
commit 05277f5caf68cd06eac04130c2713d40b066690f
Author: Bastien <bzg@gnu.org>
Commit: Bastien <bzg@gnu.org>
lisp/org.el: Fix previous merge commit
---
lisp/org.el | 4 ----
1 file changed, 4 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index 934e7b5..04da1af 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9,11 +9,7 @@
;; Homepage: https://orgmode.org
;; Package-Requires: ((emacs "24.3"))
-<<<<<<< HEAD
;; Version: 9.5-dev
-=======
-;; Version: 9.4.5
->>>>>>> maint
;; This file is part of GNU Emacs.
;;