Merge conflict

1 files changed, 0 insertions, 68 deletions

diff --git a/elpa/org-9.5.2/ob-sass.el b/elpa/org-9.5.2/ob-sass.el
deleted file mode 100644
index c8762ca..0000000
--- a/elpa/org-9.5.2/ob-sass.el
+++ /dev/null
@@ -1,68 +0,0 @@
-;;; ob-sass.el --- Babel Functions for the Sass CSS generation language -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2009-2021 Free Software Foundation, Inc.
-
-;; Author: Eric Schulte
-;; 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:
-
-;; For more information on sass see https://sass-lang.com/
-;;
-;; This accepts a 'file' header argument which is the target of the
-;; compiled sass.  The default output type for sass evaluation is
-;; either file (if a 'file' header argument was given) or scalar if no
-;; such header argument was supplied.
-;;
-;; A 'cmdline' header argument can be supplied to pass arguments to
-;; the sass command line.
-
-;;; Requirements:
-
-;; - sass-mode :: https://github.com/nex3/haml/blob/master/extra/sass-mode.el
-
-;;; Code:
-(require 'ob)
-
-(defvar org-babel-default-header-args:sass '())
-
-(defun org-babel-execute:sass (body params)
-  "Execute a block of Sass code with Babel.
-This function is called by `org-babel-execute-src-block'."
-  (let* ((file (cdr (assq :file params)))
-         (out-file (or file (org-babel-temp-file "sass-out-")))
-         (cmdline (cdr (assq :cmdline params)))
-         (in-file (org-babel-temp-file "sass-in-"))
-         (cmd (concat "sass " (or cmdline "")
-		      " " (org-babel-process-file-name in-file)
-		      " " (org-babel-process-file-name out-file))))
-    (with-temp-file in-file
-      (insert (org-babel-expand-body:generic body params)))
-    (org-babel-eval cmd "")
-    (if file
-	nil ;; signal that output has already been written to file
-      (with-temp-buffer (insert-file-contents out-file) (buffer-string)))))
-
-(defun org-babel-prep-session:sass (_session _params)
-  "Raise an error because sass does not support sessions."
-  (error "Sass does not support sessions"))
-
-(provide 'ob-sass)
-
-;;; ob-sass.el ends here