[Fusionforge-commits] FusionForge branch Branch_5_2 updated. 4056e209e5e1d09260506f9404578d6c4c79ba46

Roland Mas lolando at fusionforge.org
Thu Jul 18 12:00:48 CEST 2013

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 "FusionForge".

The branch, Branch_5_2 has been updated
       via  4056e209e5e1d09260506f9404578d6c4c79ba46 (commit)
      from  2b3ac7b0e433c419362a490b7b3199d52969d7f6 (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 4056e209e5e1d09260506f9404578d6c4c79ba46
Author: Roland Mas <lolando at debian.org>
Date:   Thu Jul 18 12:00:41 2013 +0200

    Removed file conflict between fusionforge-plugin-blocks and gforge-common

diff --git a/src/plugins/blocks/packaging/links/plugin-blocks b/src/plugins/blocks/packaging/links/plugin-blocks
index 55765db..2a4d448 100644
--- a/src/plugins/blocks/packaging/links/plugin-blocks
+++ b/src/plugins/blocks/packaging/links/plugin-blocks
@@ -1,2 +1 @@
 /usr/share/@OLDPACKAGE@/plugins/blocks/www /usr/share/@OLDPACKAGE@/www/plugins/blocks
-/etc/@PACKAGE@/config.ini.d /etc/@OLDPACKAGE@/config.ini.d


Summary of changes:
 src/plugins/blocks/packaging/links/plugin-blocks |    1 -
 1 file changed, 1 deletion(-)


More information about the Fusionforge-commits mailing list