[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org a169bdd 1/2: Merge branch 'maint'
|
From: |
ELPA Syncer |
|
Subject: |
[elpa] externals/org a169bdd 1/2: Merge branch 'maint' |
|
Date: |
Sun, 28 Mar 2021 11:57:14 -0400 (EDT) |
branch: externals/org
commit a169bdde3b38481d32745db54730d12fbe703b92
Merge: 7a62a4d 287af20
Author: Bastien <bzg@gnu.org>
Commit: Bastien <bzg@gnu.org>
Merge branch 'maint'
---
lisp/org.el | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/lisp/org.el b/lisp/org.el
index 04da1af..934e7b5 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9,7 +9,11 @@
;; 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.
;;