OSDN Git Service

[fix] : Fixed file conflict
authorhayao <shun819.mail@gmail.com>
Wed, 30 Sep 2020 10:02:54 +0000 (19:02 +0900)
committerhayao <shun819.mail@gmail.com>
Wed, 30 Sep 2020 10:02:54 +0000 (19:02 +0900)
commit19e9977bf483dc5fd0097a33dc8bc59c39e5f177
treef97dd300053d816ce335ea84d92e841b42e68882
parent65ffe7f5e6db1354b84c7690a41f98168eb9882a
[fix] : Fixed file conflict

https://bbs.archlinux32.org/viewtopic.php?pid=7428
channels/cinnamon/packages.i686/other.i686
channels/cinnamon/packages.x86_64/other.x86_64
channels/i3/packages.i686/packages.i686
channels/i3/packages.x86_64/packages.x86_64
channels/lxde/packages.i686/other.i686
channels/lxde/packages.x86_64/other.x86_64
channels/xfce/packages.i686/other.i686
channels/xfce/packages.x86_64/other.x86_64