From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. d267131be3a9500e00d2cc98f48de87b830561d3
Date: Tue, 18 May 2021 12:52:10 +0000 [thread overview]
Message-ID: <4FkwrC0cgVz2xgp@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2717 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via d267131be3a9500e00d2cc98f48de87b830561d3 (commit)
from 468de80470ab5109b48c2b22b5cd7e25562eb349 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d267131be3a9500e00d2cc98f48de87b830561d3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue May 18 12:51:59 2021 +0000
Fix merge error in samba rootfiles
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/packages/aarch64/samba | 4 ----
config/rootfiles/packages/i586/samba | 4 ----
2 files changed, 8 deletions(-)
Difference in files:
diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba
index ddc964c5c..88b7905ce 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 d302dd703..6b43544f1 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
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2021-05-18 12:52 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FkwrC0cgVz2xgp@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox