Fix merge error in samba rootfiles

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba
index ddc964c5c8a6703366687b475d727dff1cac610b..88b7905ce3d7806acdec63e4ef54e3c7f6d215ee 100644 (file)
--- a/config/rootfiles/packages/aarch64/samba
+++ b/config/rootfiles/packages/aarch64/samba
@@ -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

diff --git a/config/rootfiles/packages/i586/samba b/config/rootfiles/packages/i586/samba
index d302dd7030075b4a9a6c3d1c9e88ed47d5e305c1..6b43544f1155bbd280549f22c13e8a83d1df94bd 100644 (file)
--- a/config/rootfiles/packages/i586/samba
+++ b/config/rootfiles/packages/i586/samba
@@ -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