diff options
author | mattkae <mattkae@protonmail.com> | 2022-06-07 08:23:47 -0400 |
---|---|---|
committer | mattkae <mattkae@protonmail.com> | 2022-06-07 08:23:47 -0400 |
commit | bd18a38c2898548a3664a9ddab9f79c84f2caf4a (patch) | |
tree | 95b9933376770381bd8859782ae763be81c2d72b /elpa/org-9.5.2/org-pkg.el | |
parent | b07628dddf418d4f47b858e6c35fd3520fbaeed2 (diff) | |
parent | ef160dea332af4b4fe5e2717b962936c67e5fe9e (diff) |
Merge conflict
Diffstat (limited to 'elpa/org-9.5.2/org-pkg.el')
-rw-r--r-- | elpa/org-9.5.2/org-pkg.el | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/elpa/org-9.5.2/org-pkg.el b/elpa/org-9.5.2/org-pkg.el deleted file mode 100644 index 68f10a5..0000000 --- a/elpa/org-9.5.2/org-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;; Generated package description from org.el -*- no-byte-compile: t -*- -(define-package "org" "9.5.2" "Outline-based notes management and organizer" '((emacs "25.1")) :authors '(("Carsten Dominik" . "carsten.dominik@gmail.com")) :maintainer '("Bastien Guerry" . "bzg@gnu.org") :keywords '("outlines" "hypermedia" "calendar" "wp") :url "https://orgmode.org") |