From: Michael Tremer Date: Tue, 18 May 2021 12:51:59 +0000 (+0000) Subject: Fix merge error in samba rootfiles X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d267131be3a9500e00d2cc98f48de87b830561d3;p=people%2Fstevee%2Fipfire-2.x.git Fix merge error in samba rootfiles Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba index ddc964c5c8..88b7905ce3 100644 --- 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 d302dd7030..6b43544f11 100644 --- 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