Merge branch 'next'

[people/mfischer/ipfire-2.x.git] / config / rootfiles / packages / i586 / samba

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