OSDN Git Service

[fix] : Fixed file conflict
authorhayao <shun819.mail@gmail.com>
Wed, 30 Sep 2020 10:01:20 +0000 (19:01 +0900)
committerhayao <shun819.mail@gmail.com>
Wed, 30 Sep 2020 10:01:20 +0000 (19:01 +0900)
commit11756e8c950591ac99b9ecbd00f84f0d8745dcf5
tree7bbd6a1d2f69c7ef939b09d04ec4af6794722fce
parent4b2ba0364403646087ebb8b1f166fd0d8e06d1d3
[fix] : Fixed file conflict

https://bbs.archlinux32.org/viewtopic.php?pid=7428
14 files changed:
channels/cinnamon/packages.i686/other.i686
channels/cinnamon/packages.x86_64/other.x86_64
channels/deepin/packages.x86_64/other.x86_64
channels/gnome-mac/packages.x86_64/filesystem.x86_64
channels/gnome/packages.x86_64/filesystem.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/serene/packages.i686/other.i686
channels/serene/packages.x86_64/other.x86_64
channels/xfce-pro/packages.x86_64/other.x86_64
channels/xfce/packages.i686/other.i686
channels/xfce/packages.x86_64/other.x86_64