Merge conflict

1 files changed, 0 insertions, 24 deletions

diff --git a/elpa/org-9.5.2/org-version.el b/elpa/org-9.5.2/org-version.el
deleted file mode 100644
index a80e50a..0000000
--- a/elpa/org-9.5.2/org-version.el
+++ /dev/null
@@ -1,24 +0,0 @@
-;;; org-version.el --- autogenerated file, do not edit  -*- lexical-binding: t -*-
-;;
-;;; Code:
-;;;###autoload
-(defun org-release ()
-  "The release version of Org.
-Inserted by installing Org mode or when a release is made."
-   (let ((org-release "9.5.2"))
-     org-release))
-;;;###autoload
-(defun org-git-version ()
-  "The Git version of Org mode.
-Inserted by installing Org or when a release is made."
-   (let ((org-git-version "9.5.2-gfbff08"))
-     org-git-version))
-
-(provide 'org-version)
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; coding: utf-8
-;; End:
-;;; org-version.el ends here