summaryrefslogtreecommitdiffstats
path: root/emacs-lisp/auctex/CONFLICTS
diff options
context:
space:
mode:
Diffstat (limited to 'emacs-lisp/auctex/CONFLICTS')
-rwxr-xr-xemacs-lisp/auctex/CONFLICTS1
1 files changed, 1 insertions, 0 deletions
diff --git a/emacs-lisp/auctex/CONFLICTS b/emacs-lisp/auctex/CONFLICTS
new file mode 100755
index 0000000000..ef81aa722e
--- /dev/null
+++ b/emacs-lisp/auctex/CONFLICTS
@@ -0,0 +1 @@
+conflicts preview-latex y