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

[Wookey]

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

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

commit f5f866743fd3ad9acf558bbd6eb35fa87ca3a3b3
Merge: 555d40b 6527af3
Author: Wookey <wookey at wookware.org>
Date:   Thu Nov 26 04:22:01 2015 +0000

    Merge branch 'master' of ssh://git.debian.org/git/debian-science/packages/ros/ros-roslisp
    
    Conflicts:
    	debian/rules

 debian/roslisp.install |  3 +++
 debian/rules           | 16 ++++------------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --cc debian/rules
index a20ff81,e98c762..98debda
--- a/debian/rules
+++ b/debian/rules
@@@ -2,12 -2,6 +2,10 @@@
  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