[catkin-pkg] 01/04: Revert upstream changes done while merging

[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 dfc4b9541fb0d6043fab9678065b3d20c58ee989
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Thu Dec 11 10:09:27 2014 +0100

    Revert upstream changes done while merging
---
 .travis.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9e43202..dfb276f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,13 @@
 language: python
 python:
-- "2.7"
-- "3.2"
-- "3.3"
+  - "2.7"
+  - "3.2"
+  - "3.3"
 # command to install dependencies
 install:
-- pip install nose coverage argparse python-dateutil docutils
+  - pip install nose coverage argparse python-dateutil docutils
 # command to run tests
 script:
-- nosetests -s --tests test
+  - nosetests -s --tests test
 notifications:
-email: false
+  email: false

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