Merge conflict

1 files changed, 0 insertions, 48 deletions

diff --git a/elpa/auctex-13.1.3/latex/prauctex.cfg b/elpa/auctex-13.1.3/latex/prauctex.cfg
deleted file mode 100644
index 39922c9..0000000
--- a/elpa/auctex-13.1.3/latex/prauctex.cfg
+++ /dev/null
@@ -1,48 +0,0 @@
-%%
-%% This is file `prauctex.cfg',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% preview.dtx  (with options: `auccfg')
-%% 
-%% IMPORTANT NOTICE:
-%% 
-%% For the copyright see the source file.
-%% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from prauctex.cfg.
-%% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file preview.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
-%%    The preview style for extracting previews from LaTeX documents.
-%%    Developed as part of AUCTeX <URL:https://www.gnu.org/software/auctex/>.
-\PreviewMacro*[[][#1{}]\footnote
-\PreviewMacro*[?[{@{[]}}{}][#1]\item
-\PreviewMacro*\emph
-\PreviewMacro*\textrm
-\PreviewMacro*\textit
-\PreviewMacro*\textsc
-\PreviewMacro*\textsf
-\PreviewMacro*\textsl
-\PreviewMacro*\texttt
-\PreviewMacro*\textcolor
-\PreviewMacro*\mbox
-\PreviewMacro*[][#1{}]\author
-\PreviewMacro*[][#1{}]\title
-\PreviewMacro*\and
-\PreviewMacro*\thanks
-\PreviewMacro*[][#1{}]\caption
-\preview@delay{\@ifundefined{pr@\string\@startsection}{%
-  \PreviewMacro*[!!!!!!*][#1{}]\@startsection}{}}
-\preview@delay{\@ifundefined{pr@\string\chapter}{%
-  \PreviewMacro*[*][#1{}]\chapter}{}}
-\PreviewMacro*\index
-\endinput
-%%
-%% End of file `prauctex.cfg'.