Merge conflict

1 files changed, 0 insertions, 32 deletions

diff --git a/elpa/auctex-13.1.3/latex/prlyx.def b/elpa/auctex-13.1.3/latex/prlyx.def
deleted file mode 100644
index ac3397e..0000000
--- a/elpa/auctex-13.1.3/latex/prlyx.def
+++ /dev/null
@@ -1,32 +0,0 @@
-%%
-%% This is file `prlyx.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% preview.dtx  (with options: `lyx')
-%% 
-%% IMPORTANT NOTICE:
-%% 
-%% For the copyright see the source file.
-%% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from prlyx.def.
-%% 
-%% 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/>.
-\ifPreview\else\expandafter\endinput\fi
-\pr@loadcfg{prlyx}
-\g@addto@macro\pr@ship@end{\typeout{Preview:
-  Snippet \number\pr@snippet\space
-  \number\ht\pr@box\space \number\dp\pr@box \space\number\wd\pr@box}}
-\endinput
-%%
-%% End of file `prlyx.def'.