summarylogtreecommitdiffstats
path: root/.SRCINFO
diff options
context:
space:
mode:
Diffstat (limited to '.SRCINFO')
-rw-r--r--.SRCINFO4
1 files changed, 2 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e671a9e82e20..512b301565c3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,3 @@
-# Generated by mksrcinfo v8
-# Thu Jun 1 00:21:26 UTC 2017
pkgbase = python-rosinstall_generator
pkgdesc = A tool to generator rosinstall files
pkgver = 0.1.13
@@ -20,6 +18,7 @@ pkgname = python-rosinstall_generator
depends = python-rosdistro
depends = python-rospkg
depends = python-yaml
+ conflicts = python2-rosinstall_generator
pkgname = python2-rosinstall_generator
depends =
@@ -29,4 +28,5 @@ pkgname = python2-rosinstall_generator
depends = python2-rosdistro
depends = python2-rospkg
depends = python2-yaml
+ conflicts = python-rosinstall_generator