[Gsrc-commit] /srv/bzr/gsrc/trunk r1070: fix merge conflict and branch divergence

[Brandon Invergo]

------------------------------------------------------------
revno: 1070 [merge]
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Tue 2012-11-06 09:26:27 +0100
message:
  fix merge conflict and branch divergence
modified:
  gnu/gnump3d/Makefile

=== modified file 'gnu/gnump3d/Makefile'
--- a/gnu/gnump3d/Makefile      2012-11-05 20:05:01 +0000
+++ b/gnu/gnump3d/Makefile      2012-11-06 08:26:27 +0000
@@ -18,7 +18,6 @@
 
 include ../../gar.mk
 
-
 pre-install:
        @sed -i -e 's|\(PREFIX     = \)|\1 $(packageprefix)|' 
$(WORKSRC)/Makefile
        @sed -i -e 's|$\{PREFIX\}/|$\{PREFIX\}|' $(WORKSRC)/Makefile