Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/merge.py
diff options
context:
space:
mode:
authorAlan Aguiar <alanjas@hotmail.com>2012-11-14 23:22:59 (GMT)
committer Alan Aguiar <alanjas@hotmail.com>2012-11-14 23:22:59 (GMT)
commitc8bfd9b2fbfed43c2e3ceace42460855cdb3432a (patch)
treee568f09b0c4910fac1cae6c36886e340184f07df /merge.py
parentbe8008e11645c85f227912beca809aa6c35c9240 (diff)
use another path for TurtleBots merge
Diffstat (limited to 'merge.py')
-rwxr-xr-xmerge.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge.py b/merge.py
index 17f7a12..0469dfa 100755
--- a/merge.py
+++ b/merge.py
@@ -11,7 +11,7 @@ if len(sys.argv) == 2:
print 'Using TurtleBots-style paths'
path = os.path.join(
os.path.abspath('..'),
- 'tmp',
+ 'mainline',
'po')
else:
print 'Using default paths'