[nongnu] elpa/yaml-mode 6d40a1d 033/124: resolved conflict

emacs-elpa-diffs

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/yaml-mode 6d40a1d 033/124: resolved conflict

From:	ELPA Syncer
Subject:	[nongnu] elpa/yaml-mode 6d40a1d 033/124: resolved conflict
Date:	Sun, 29 Aug 2021 11:36:08 -0400 (EDT)

branch: elpa/yaml-mode
commit 6d40a1dbd4c83f91d70f0e646e7bd8a45acc6fbf
Merge: 9e07024 5eae0c1
Author: Yoshiki Kurihara <clouder@gmail.com>
Commit: Yoshiki Kurihara <clouder@gmail.com>

    resolved conflict

[Prev in Thread]

Current Thread

[Next in Thread]

[nongnu] elpa/yaml-mode 1cff904 067/124: fix regex in adding yaml-mode to auto-mode-alist, (continued)
- [nongnu] elpa/yaml-mode 1cff904 067/124: fix regex in adding yaml-mode to auto-mode-alist, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 3fc5a33 094/124: Mark block literals to unfontify quotes in them, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 41adb32 112/124: Merge pull request #77 from dgutov/single-quote-fixup, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode fea2fb0 114/124: Mention the bug report, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 97a58b3 109/124: Make sure not to pre-fill ppss cache with wrong entries, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 68fecb5 118/124: Exclude newline from `yaml-nested-map-re`, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode e142e65 008/124: added newline, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode f68472b 024/124: automatically enable yaml-mode for *.yaml files, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode cf171f4 026/124: `checkdoc' nits (including the `checkdoc-autoload' extension)., ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode e2befd8 027/124: Merge pull request #7 from SamB/master, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 6d40a1d 033/124: resolved conflict, ELPA Syncer <=
- [nongnu] elpa/yaml-mode d1b8be6 039/124: Merge pull request #23 from Wilfred/master, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 11df403 044/124: Merge pull request #30 from rhoml/enable-eyaml, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 85d5c63 050/124: allow dash-newline to start a sequence, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 6590b19 060/124: add copy of GPLv2, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 4ae92a7 062/124: Define keymap and syntax table properly, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode c757396 066/124: Remove unnecessary refontification, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 44f73b6 017/124: Add autoload comments., ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 4c1127c 037/124: Improve paragraph filling of block literals, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode d88c80a 053/124: allow spaces before dash-newline, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 4e69e6e 059/124: update address for FSF, ELPA Syncer, 2021/08/29

Prev by Date: [nongnu] elpa/yaml-mode e2befd8 027/124: Merge pull request #7 from SamB/master
Next by Date: [nongnu] elpa/yaml-mode d1b8be6 039/124: Merge pull request #23 from Wilfred/master
Previous by thread: [nongnu] elpa/yaml-mode e2befd8 027/124: Merge pull request #7 from SamB/master
Next by thread: [nongnu] elpa/yaml-mode d1b8be6 039/124: Merge pull request #23 from Wilfred/master
Index(es):
- Date
- Thread