Merge conflict

1 files changed, 0 insertions, 53 deletions

diff --git a/elpa/org-9.5.2/doc/doc-setup.org b/elpa/org-9.5.2/doc/doc-setup.org
deleted file mode 100644
index f59660e..0000000
--- a/elpa/org-9.5.2/doc/doc-setup.org
+++ /dev/null
@@ -1,53 +0,0 @@
-# SETUPFILE for Org manual
-
-# Copyright (C) 2021 Free Software Foundation, Inc.
-#
-# This file is part of GNU Emacs.
-#
-# GNU Emacs 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 GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
-
-# XXX: We cannot use TODO keyword as a node starts with "TODO".
-#+todo: REVIEW FIXME | DONE
-#+property: header-args :eval no
-#+startup: overview nologdone
-
-# Use proper quote and backtick for code sections in PDF output
-# Cf. Texinfo manual 14.2
-#+texinfo_header: @set txicodequoteundirected
-#+texinfo_header: @set txicodequotebacktick
-
-# Contact Info
-#+texinfo_header: @set MAINTAINERSITE @uref{https://orgmode.org,maintainers webpage}
-#+texinfo_header: @set MAINTAINER Bastien Guerry
-#+texinfo_header: @set MAINTAINEREMAIL @email{bzg@gnu.org}
-#+texinfo_header: @set MAINTAINERCONTACT @uref{mailto:bzg@gnu.org,contact the maintainer}
-
-#+options: H:4 num:t toc:t author:t \n:nil ::t |:t ^:nil -:t f:t *:t <:t e:t ':t
-#+options: d:nil todo:nil pri:nil tags:not-in-toc stat:nil broken-links:mark
-#+select_tags: export
-#+exclude_tags: noexport
-
-#+macro: cite @@texinfo:@cite{@@$1@@texinfo:}@@
-#+macro: var @@texinfo:@var{@@$1@@texinfo:}@@
-
-# The "version" macro extracts "Version" keyword from "org.el".  It
-# returns major.minor version number.  This is sufficient since bugfix
-# releases are not expected to add features and therefore imply manual
-# modifications.
-#+macro: version (eval (with-current-buffer (find-file-noselect "../lisp/org.el") (org-with-point-at 1 (if (re-search-forward "Version: +\\([0-9.]+\\)" nil t) (mapconcat #'identity (cl-subseq (split-string (match-string-no-properties 1) "\\.") 0 2) ".") (error "Missing \"Version\" keyword in \"org.el\"")))))
-
-# The "kbd" macro turns KBD into @kbd{KBD}.  Additionally, it
-# encloses case-sensitive special keys (SPC, RET...) within @key{...}.
-#+macro: kbd (eval (let ((case-fold-search nil) (regexp (regexp-opt '("SPC" "RET" "LFD" "TAB" "BS" "ESC" "DELETE" "SHIFT" "Ctrl" "Meta" "Alt" "Cmd" "Super" "UP" "LEFT" "RIGHT" "DOWN") 'words))) (format "@@texinfo:@kbd{@@%s@@texinfo:}@@" (replace-regexp-in-string regexp "@@texinfo:@key{@@\\&@@texinfo:}@@" $1 t))))
-