[catkin-pkg] 02/04: Fix mering errors (using new debrob version)

[Jochen Sprickerhof]

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

jspricke-guest pushed a commit to branch master
in repository catkin-pkg.

commit a40b15d2035388c6c8029aeb6009a505fd90f390
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Thu Dec 11 10:14:57 2014 +0100

    Fix mering errors (using new debrob version)
---
 debian/compat | 4 ----
 debian/rules  | 7 -------
 debian/watch  | 7 -------
 3 files changed, 18 deletions(-)

diff --git a/debian/compat b/debian/compat
index 5839f0f..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1,5 +1 @@
-<<<<<<< HEAD
-7
-=======
 9
->>>>>>> 516e7af56e1770f48225ff6ebafc6611e7858718
diff --git a/debian/rules b/debian/rules
index d307925..5a73eb2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-<<<<<<< HEAD
 
 # This file was automatically generated by stdeb 0.6.0+git at
 # Mon, 01 Dec 2014 12:34:47 +0100
@@ -12,9 +11,3 @@ override_dh_clean:
 	rm -rf src/catkin_pkg.egg-info
 	dh_clean
 
-=======
-# -*- makefile -*-
-
-%:
-	dh  $@ --parallel --buildsystem=python_distutils
->>>>>>> 516e7af56e1770f48225ff6ebafc6611e7858718
diff --git a/debian/watch b/debian/watch
index 71753e4..c20c07e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Compulsory line, this is a version 3 file
 version=3
 # For GitHub projects you can use the tags page:
@@ -6,9 +5,3 @@ version=3
 opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/catkin_pkg-$1\.tar\.gz/ \         
  https://github.com/ros-infrastructure/catkin_pkg/releases .*/v?(\d\S*)\.tar\.gz
 
-=======
-version=3
-https://github.com/ros-infrastructure/catkin_pkg \
-(?:.*/|)v?(\d\S*)\.(?:tar\.(?:gz|bz2|xz)|tgz|tbz2|txz)
-# Bart Martens <bartm at debian.org> 2013-06-12 18:38:20
->>>>>>> 516e7af56e1770f48225ff6ebafc6611e7858718

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