removed outdated comment thats been solved; bump back travis to the s…

…tandard branches
pepkit · Mar 9, 2017 · 4c2155f · 4c2155f
1 parent 7bf6691
commit 4c2155f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,4 +10,6 @@ install:
 script: pytest
 branches:
   only:
-    - setupargs
+    - dev
+    - master
+
diff --git a/looper/models.py b/looper/models.py
@@ -1664,12 +1664,6 @@ class InterfaceManager(object):
     """ Aggregate PipelineInterface and ProtocolMapper objects so that a
      Project can use pipelines distributed across multiple locations. """
 
-    # TODO: note that this permits submission of jobs for same sample for
-    # same script/pipeline name if a protocol maps to that script name in
-    # multiple pipelines_dir locations. This is intentional, but it's a
-    # design decision that can be discussed. Perhaps a boolean
-    # parameter governing this behavior could be provided.
-
 
     def __init__(self, pipeline_dirs):
         """