]> git.hungrycats.org Git - linux/commit
zygo: config: fix conflict markers
authorZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Tue, 20 Jul 2021 22:33:57 +0000 (18:33 -0400)
committerZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Tue, 20 Jul 2021 22:34:17 +0000 (18:34 -0400)
commitda26e98c938f6712d2e30ca08b3f954a6e6c728c
treeea693f656d4a1e24f5f1ab6227f2da2a101224b4
parent3340d74c5e14f1fb0c5d5360e65990854999dba5
zygo: config: fix conflict markers

(cherry picked from commit de8fcfd2c6252fd63a095e69234c0a73f1fa9abc)
.config