[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/svg-tag-mode 607d05d972 37/63: Fix conflict
From: |
ELPA Syncer |
Subject: |
[elpa] externals/svg-tag-mode 607d05d972 37/63: Fix conflict |
Date: |
Mon, 27 Dec 2021 15:57:59 -0500 (EST) |
branch: externals/svg-tag-mode
commit 607d05d972e0f308a4c88db95c1b3abc670c6c5f
Merge: 29ca63cdbb 95b5404997
Author: Nicolas P. Rougier <Nicolas.Rougier@inria.fr>
Commit: Nicolas P. Rougier <Nicolas.Rougier@inria.fr>
Fix conflict
---
svg-tag-mode.el | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/svg-tag-mode.el b/svg-tag-mode.el
index 06324c8dc3..dd49c7d81b 100644
--- a/svg-tag-mode.el
+++ b/svg-tag-mode.el
@@ -109,6 +109,7 @@
;; Version 0.1:
;; - Proof of concept
;;
+
;;; Code:
(require 'svg-lib)
@@ -274,5 +275,7 @@ allows to create dynamic tags."
global-svg-tag-mode svg-tag-mode svg-tag-mode-on)
(provide 'svg-tag-mode)
-
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; End:
;;; svg-tag-mode.el ends here
- [elpa] externals/svg-tag-mode 4fe6ce8681 13/63: Typo, (continued)
- [elpa] externals/svg-tag-mode 4fe6ce8681 13/63: Typo, ELPA Syncer, 2021/12/27
- [elpa] externals/svg-tag-mode 4894900f52 10/63: Merge pull request #6 from a13/main, ELPA Syncer, 2021/12/27
- [elpa] externals/svg-tag-mode fc57d2d4bb 11/63: Normalized names, ELPA Syncer, 2021/12/27
- [elpa] externals/svg-tag-mode 2dc379039a 15/63: Updated example, ELPA Syncer, 2021/12/27
- [elpa] externals/svg-tag-mode 87489d2845 31/63: Fixed warning (see https://github.com/melpa/melpa/pull/7217#issuecomment-735307276), ELPA Syncer, 2021/12/27
- [elpa] externals/svg-tag-mode a34a2e1128 32/63: Added scale of 1 just in case, ELPA Syncer, 2021/12/27
- [elpa] externals/svg-tag-mode 2c4a3a02a1 33/63: Enforce use of spaces for indentation, ELPA Syncer, 2021/12/27
- [elpa] externals/svg-tag-mode 83fc912461 51/63: Updated screenshots, ELPA Syncer, 2021/12/27
- [elpa] externals/svg-tag-mode 837dfbdd06 48/63: Fixed documentation., ELPA Syncer, 2021/12/27
- [elpa] externals/svg-tag-mode ede0edb5c3 25/63: Lint correction, ELPA Syncer, 2021/12/27
- [elpa] externals/svg-tag-mode 607d05d972 37/63: Fix conflict,
ELPA Syncer <=
- [elpa] externals/svg-tag-mode 60d56f3f41 29/63: Fixed terminal mode error, ELPA Syncer, 2021/12/27
- [elpa] externals/svg-tag-mode 4fb494db21 43/63: Changed style of date, ELPA Syncer, 2021/12/27
- [elpa] externals/svg-tag-mode 3dd9bef838 59/63: Removed `org-plist-delete` dependency., ELPA Syncer, 2021/12/27
- [elpa] externals/svg-tag-mode 60140b7526 62/63: Remove ununsed local variables., ELPA Syncer, 2021/12/27
- [elpa] externals/svg-tag-mode c78500db2c 60/63: Fix bugs (typos)., ELPA Syncer, 2021/12/27
- [elpa] externals/svg-tag-mode de9aba3f37 09/63: Fix style and naming, ELPA Syncer, 2021/12/27
- [elpa] externals/svg-tag-mode 90c15ebc07 05/63: Load subr-x for string-trim, ELPA Syncer, 2021/12/27
- [elpa] externals/svg-tag-mode e9d0df33a6 12/63: Better default, ELPA Syncer, 2021/12/27
- [elpa] externals/svg-tag-mode a5af3041c4 07/63: Added customizable options, ELPA Syncer, 2021/12/27
- [elpa] externals/svg-tag-mode 0944bb3bce 14/63: Simplified tag setup and added custom variable for tags, ELPA Syncer, 2021/12/27