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 3.x development tree".
The branch, master has been updated via 8a6e7e24612924bde5764140ef875d18f29a97fa (commit) via df49f08912dbb535403ead16c1a89a92ba3d7bc7 (commit) from eac44f69edabee2200a5ad5ed34483a0afc2a788 (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 8a6e7e24612924bde5764140ef875d18f29a97fa Merge: df49f08 eac44f6 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jun 26 21:15:44 2013 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit df49f08912dbb535403ead16c1a89a92ba3d7bc7 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jun 26 21:15:04 2013 +0200
systemd: Fix redundant conflict which confuses the solver.
-----------------------------------------------------------------------
Summary of changes: systemd/systemd.nm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
Difference in files: diff --git a/systemd/systemd.nm b/systemd/systemd.nm index 5d971f9..ea7d6ea 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -5,7 +5,7 @@
name = systemd version = 204 -release = 3 +release = 4
maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = System/Base @@ -290,8 +290,6 @@ packages end
conflicts - nss-myhostname <= 0.3-3 - # Ensure that the version of systemd matches systemd-libs. systemd > %{thisver} systemd < %{thisver}
hooks/post-receive -- IPFire 3.x development tree