projects
/
fusionforge
/
fusionforge.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
project home
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2b3ac7b
)
Removed file conflict between fusionforge-plugin-blocks and gforge-common
author
Roland Mas
<lolando@debian.org>
Thu, 18 Jul 2013 10:00:41 +0000
(12:00 +0200)
committer
Roland Mas
<lolando@debian.org>
Thu, 18 Jul 2013 10:00:41 +0000
(12:00 +0200)
src/plugins/blocks/packaging/links/plugin-blocks
patch
|
blob
|
history
diff --git
a/src/plugins/blocks/packaging/links/plugin-blocks
b/src/plugins/blocks/packaging/links/plugin-blocks
index 55765db6edbe207c46f2cf10d886b3b49dd86449..2a4d448200da6052b7f4c7ec388c317388912d9d 100644
(file)
--- 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
/usr/share/@OLDPACKAGE@/plugins/blocks/www /usr/share/@OLDPACKAGE@/www/plugins/blocks
-/etc/@PACKAGE@/config.ini.d /etc/@OLDPACKAGE@/config.ini.d