[ros-roslisp] 01/01: Revert "Merge branch 'master' of ssh://git.debian.org/git/debian-science/packages/ros/ros-roslisp"

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke-guest pushed a commit to branch master
in repository ros-roslisp.

commit f69eeb41de4182ae9dba61d82737e6561ce834f2
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Thu Nov 26 08:26:43 2015 +0100

    Revert "Merge branch 'master' of ssh://git.debian.org/git/debian-science/packages/ros/ros-roslisp"
    
    This reverts commit f5f866743fd3ad9acf558bbd6eb35fa87ca3a3b3, reversing
    changes made to 6527af3df7b7f4cb453fd414fa6df27fe0281a5b.
---
 debian/rules | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 98debda..e98c762 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +2,6 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
 
-<<<<<<< HEAD
-# main packaging script based on dh7 syntax
-=======
->>>>>>> 6527af3df7b7f4cb453fd414fa6df27fe0281a5b
 %:
 	dh $@ 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-roslisp.git