[fix] : Fixed file conflict

Hayao0819 · Hayao0819 · commit 19e9977bf483 · 2020-09-30T19:02:54.000+09:00
https://bbs.archlinux32.org/viewtopic.php?pid=7428
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -14,6 +14,7 @@ xarchiver
 
 
 #-- GVFS --#
+smbclient
 gvfs
 gvfs-smb
 
