webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-12 04:05:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge error in samba rootfiles

Browse Source 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2021-05-18 12:51:59 +00:00
parent 468de80470
commit d267131be3
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/rootfiles/packages/aarch64/samba
View File

@@ -701,11 +701,7 @@ usr/lib/samba/libposix-eadb-samba4.so
usr/lib/samba/libprinter-driver-samba4.so
usr/lib/samba/libprinting-migrate-samba4.so
usr/lib/samba/libpyldb-util.cpython-38-aarch64-linux-gnu.so.2
<<<<<<< HEAD
usr/lib/samba/libpyldb-util.cpython-38-aarch64-linux-gnu.so.2.2.1
=======
usr/lib/samba/libpyldb-util.cpython-38-aarch64-linux-gnu.so.2.3.0
>>>>>>> next
usr/lib/samba/libpytalloc-util.cpython-38-aarch64-linux-gnu.so.2
usr/lib/samba/libpytalloc-util.cpython-38-aarch64-linux-gnu.so.2.3.2
usr/lib/samba/libregistry-samba4.so

4
config/rootfiles/packages/i586/samba
View File

@@ -701,11 +701,7 @@ usr/lib/samba/libposix-eadb-samba4.so
usr/lib/samba/libprinter-driver-samba4.so
usr/lib/samba/libprinting-migrate-samba4.so
usr/lib/samba/libpyldb-util.cpython-38-i386-linux-gnu.so.2
<<<<<<< HEAD
usr/lib/samba/libpyldb-util.cpython-38-i386-linux-gnu.so.2.2.1
=======
usr/lib/samba/libpyldb-util.cpython-38-i386-linux-gnu.so.2.3.0
>>>>>>> next
usr/lib/samba/libpytalloc-util.cpython-38-i386-linux-gnu.so.2
usr/lib/samba/libpytalloc-util.cpython-38-i386-linux-gnu.so.2.3.2
usr/lib/samba/libregistry-samba4.so