124: resolved conflict

ELPA Syncer Sun, 29 Aug 2021 08:51:17 -0700

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


    resolved conflict

[nongnu] elpa/yaml-mode 3a57058 122/124: Pacify package-lint ELPA Syncer
[nongnu] elpa/yaml-mode 45e52cb 006/124: merge TEST-JULIAN-PAT... ELPA Syncer
[nongnu] elpa/yaml-mode 6694896 002/124: change e-mail ELPA Syncer
[nongnu] elpa/yaml-mode 67348f3 014/124: dash (-) is a word ch... ELPA Syncer
[nongnu] elpa/yaml-mode 44f73b6 017/124: Add autoload comments... ELPA Syncer
[nongnu] elpa/yaml-mode c2ac933 023/124: changed version ELPA Syncer
[nongnu] elpa/yaml-mode b751113 021/124: Merge pull request #5... ELPA Syncer
[nongnu] elpa/yaml-mode f68472b 024/124: automatically enable ... ELPA Syncer
[nongnu] elpa/yaml-mode 1a779ba 029/124: Merge pull request #8... ELPA Syncer
[nongnu] elpa/yaml-mode 5eae0c1 031/124: Changed version to 0.... ELPA Syncer
[nongnu] elpa/yaml-mode 6d40a1d 033/124: resolved conflict ELPA Syncer
[nongnu] elpa/yaml-mode 737c7fc 034/124: Remove default C-j bi... ELPA Syncer
[nongnu] elpa/yaml-mode 5f92179 035/124: Merge pull request #1... ELPA Syncer
[nongnu] elpa/yaml-mode fb17c37 036/124: Bumping version to 0.... ELPA Syncer
[nongnu] elpa/yaml-mode 34b6367 041/124: Use font-lock-flush w... ELPA Syncer
[nongnu] elpa/yaml-mode 67b8355 042/124: Merge pull request #2... ELPA Syncer
[nongnu] elpa/yaml-mode 2941501 043/124: Merge pull request #2... ELPA Syncer
[nongnu] elpa/yaml-mode a96d09d 054/124: Description of behavi... ELPA Syncer
[nongnu] elpa/yaml-mode 4ae92a7 062/124: Define keymap and syn... ELPA Syncer
[nongnu] elpa/yaml-mode 1cff904 067/124: fix regex in adding y... ELPA Syncer
[nongnu] elpa/yaml-mode e73adce 069/124: Fix regex in autoload... ELPA Syncer

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

Reply via email to