Merge conflict

1 files changed, 0 insertions, 66 deletions

diff --git a/elpa/org-9.5.2/README b/elpa/org-9.5.2/README
deleted file mode 100644
index b0e39b9..0000000
--- a/elpa/org-9.5.2/README
+++ /dev/null
@@ -1,66 +0,0 @@
--*- mode: org; fill-column:70 -*-
-
-This is a distribution of Org, a plain text notes and project planning
-tool for Emacs.
-
-Check the [[https://orgmode.org][homepage of Org]] and the [[https://orgmode.org/org.html#Installation][installations instructions]].
-
-* Contents of this distribution
-
-- README :: This file.
-
-- COPYING :: The GNU General Public License.
-
-- Makefile :: The makefile to compile and install Org.  For
-  installation instructions, see [[https://orgmode.org/org.html#Installation][the manual]] or [[https://orgmode.org/worg/dev/org-build-system.html][this more detailed
-  procedure on Worg]].
-  
-- mk/ :: Files needed for building Org.
-
-- lisp/ :: Directory with all the Emacs Lisp files that make up Org.
-
-- doc/ :: The documentation files.  org.texi is the source of the
-  documentation, org.html and org.pdf are formatted versions of it.
-
-- etc/ :: Files needed for the ODT exporter.
-
-- testing/ :: Testing suite for Org.
-
-- request-assign-future.txt :: The form that contributors have to sign
-  and get processed with the FSF before contributed changes can be
-  integrated into the Org core.  All files in this distribution have
-  copyright assigned to the FSF.
-
-* Join the GNU Project
-
-Org is part of GNU Emacs and GNU Emacs is part of the GNU Operating
-System, developed by the GNU Project.
-
-If you are the author of an awesome program and want to join us in
-writing Free (libre) Software, please consider making it an official
-GNU program and become a GNU Maintainer.  Instructions on how to do
-this are here http://www.gnu.org/help/evaluation
-
-Don't have a program to contribute?  Look at all the other ways to
-help: https://www.gnu.org/help/help.html
-
-And to learn more about Free (libre) Software in general, please
-read and share this page: https://gnu.org/philosophy/free-sw.html
-
-* License
-
-Org-mode is published under [[https://www.gnu.org/licenses/gpl-3.0.html][the GNU GPLv3 license]] or any later
-version, the same as GNU Emacs.
-
-Org-mode is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Org mode.  If not, see <https://www.gnu.org/licenses/>.