Merge conflict

1 files changed, 0 insertions, 69 deletions

diff --git a/elpa/auctex-13.1.3/style/flashcards.el b/elpa/auctex-13.1.3/style/flashcards.el
deleted file mode 100644
index c163847..0000000
--- a/elpa/auctex-13.1.3/style/flashcards.el
+++ /dev/null
@@ -1,69 +0,0 @@
-;;; flashcards.el --- AUCTeX style for the flashcards class.  -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2007, 2018, 2020 Free Software Foundation, Inc.
-
-;; Author: Ralf Angeli <angeli@caeruleus.net>
-;; Maintainer: auctex-devel@gnu.org
-;; Created: 2007-04-23
-;; Keywords: tex
-
-;; This file is part of AUCTeX.
-
-;; AUCTeX 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, or (at your option)
-;; any later version.
-
-;; AUCTeX 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 AUCTeX; see the file COPYING.  If not, write to the Free
-;; Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-;; 02110-1301, USA.
-
-;;; Commentary:
-
-;; This file adds support for the flashcards class.
-
-;;; Code:
-
-(require 'tex)
-(require 'latex)
-
-;; Silence the compiler:
-(declare-function font-latex-add-keywords
-                  "font-latex"
-                  (keywords class))
-
-(TeX-add-style-hook
- "flashcards"
- (lambda ()
-   (TeX-add-symbols
-    '("cardfrontstyle" ["Format"] "Style")
-    '("cardfrontfoot" "Footer text")
-    '("cardbackstyle" ["Format"] "Style")
-    '("cardfrontheadstyle" ["Format"] "Style")
-    '("cardfrontfootstyle" ["Format"] "Style")
-    "cardmargin"
-    "cardpaper"
-    "cardpapermode"
-    "cardrows"
-    "cardcolumns"
-    "cardheight"
-    "cardwidth")
-   (LaTeX-add-environments '("flashcard" ["Header"] "Front side"))
-   ;; Fontification
-   (when (and (fboundp 'font-latex-add-keywords)
-              (eq TeX-install-font-lock 'font-latex-setup))
-     (font-latex-add-keywords '(("cardfrontstyle" "[{")
-                                ("cardfrontfoot" "{")
-                                ("cardbackstyle" "[{")
-                                ("cardfrontheadstyle" "[{")
-                                ("cardfrontfootstyle" "[{"))
-                              'variable)))
- TeX-dialect)
-
-;;; flashcards.el ends here