From 19e9977bf483dc5fd0097a33dc8bc59c39e5f177 Mon Sep 17 00:00:00 2001 From: hayao Date: Wed, 30 Sep 2020 19:02:54 +0900 Subject: [PATCH] [fix] : Fixed file conflict https://bbs.archlinux32.org/viewtopic.php?pid=7428 --- channels/cinnamon/packages.i686/other.i686 | 1 + channels/cinnamon/packages.x86_64/other.x86_64 | 1 + channels/i3/packages.i686/packages.i686 | 1 + channels/i3/packages.x86_64/packages.x86_64 | 1 + channels/lxde/packages.i686/other.i686 | 1 + channels/lxde/packages.x86_64/other.x86_64 | 1 + channels/xfce/packages.i686/other.i686 | 1 + channels/xfce/packages.x86_64/other.x86_64 | 1 + 8 files changed, 8 insertions(+) diff --git a/channels/cinnamon/packages.i686/other.i686 b/channels/cinnamon/packages.i686/other.i686 index d18bb818..8490f8ba 100644 --- a/channels/cinnamon/packages.i686/other.i686 +++ b/channels/cinnamon/packages.i686/other.i686 @@ -14,6 +14,7 @@ xarchiver #-- GVFS --# +smbclient gvfs gvfs-smb diff --git a/channels/cinnamon/packages.x86_64/other.x86_64 b/channels/cinnamon/packages.x86_64/other.x86_64 index 924a1103..71950014 100644 --- a/channels/cinnamon/packages.x86_64/other.x86_64 +++ b/channels/cinnamon/packages.x86_64/other.x86_64 @@ -14,6 +14,7 @@ xarchiver #-- GVFS --# +smbclient gvfs gvfs-smb diff --git a/channels/i3/packages.i686/packages.i686 b/channels/i3/packages.i686/packages.i686 index 4a24a4b2..8f609cd3 100644 --- a/channels/i3/packages.i686/packages.i686 +++ b/channels/i3/packages.i686/packages.i686 @@ -28,6 +28,7 @@ smartmontools testdisk vim-minimal grub-theme-vimix +smbclient gvfs-smb gvfs sshfs diff --git a/channels/i3/packages.x86_64/packages.x86_64 b/channels/i3/packages.x86_64/packages.x86_64 index 4a24a4b2..8f609cd3 100644 --- a/channels/i3/packages.x86_64/packages.x86_64 +++ b/channels/i3/packages.x86_64/packages.x86_64 @@ -28,6 +28,7 @@ smartmontools testdisk vim-minimal grub-theme-vimix +smbclient gvfs-smb gvfs sshfs diff --git a/channels/lxde/packages.i686/other.i686 b/channels/lxde/packages.i686/other.i686 index 67db63dd..44847c5e 100644 --- a/channels/lxde/packages.i686/other.i686 +++ b/channels/lxde/packages.i686/other.i686 @@ -14,6 +14,7 @@ xarchiver #-- GVFS --# +smbclient gvfs gvfs-smb diff --git a/channels/lxde/packages.x86_64/other.x86_64 b/channels/lxde/packages.x86_64/other.x86_64 index c92970ac..6f9317ef 100644 --- a/channels/lxde/packages.x86_64/other.x86_64 +++ b/channels/lxde/packages.x86_64/other.x86_64 @@ -14,6 +14,7 @@ xarchiver #-- GVFS --# +smbclient gvfs gvfs-smb diff --git a/channels/xfce/packages.i686/other.i686 b/channels/xfce/packages.i686/other.i686 index da9ef24a..a387f66b 100644 --- a/channels/xfce/packages.i686/other.i686 +++ b/channels/xfce/packages.i686/other.i686 @@ -14,6 +14,7 @@ xarchiver #-- GVFS --# +smbclient gvfs gvfs-smb diff --git a/channels/xfce/packages.x86_64/other.x86_64 b/channels/xfce/packages.x86_64/other.x86_64 index 0cf2d221..b705a995 100644 --- a/channels/xfce/packages.x86_64/other.x86_64 +++ b/channels/xfce/packages.x86_64/other.x86_64 @@ -14,6 +14,7 @@ xarchiver #-- GVFS --# +smbclient gvfs gvfs-smb -- 2.11.0