Merge conflict

1 files changed, 0 insertions, 45 deletions

diff --git a/elpa/org-9.5.2/ob-matlab.el b/elpa/org-9.5.2/ob-matlab.el
deleted file mode 100644
index 45ec5c5..0000000
--- a/elpa/org-9.5.2/ob-matlab.el
+++ /dev/null
@@ -1,45 +0,0 @@
-;;; ob-matlab.el --- Babel support for Matlab        -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2010-2021 Free Software Foundation, Inc.
-
-;; Author: Dan Davison
-;; Keywords: literate programming, reproducible research
-;; Homepage: https://orgmode.org
-
-;; 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/>.
-
-;;; Commentary:
-
-;; Functions that are common to org-babel support for matlab and
-;; octave are in org-babel-octave.el
-
-;;; Requirements:
-
-;; Matlab
-
-;; matlab.el required for interactive emacs sessions and matlab-mode
-;; major mode for source code editing buffer
-;; http://matlab-emacs.sourceforge.net/
-
-;;; Code:
-(require 'ob)
-(require 'ob-octave)
-
-;; see ob-octave for matlab implementation
-
-(provide 'ob-matlab)
-
-;;; ob-matlab.el ends here