Cleanup missed merge conflict sections

9 years ago · 4dba30ccd0
parent d41db8edd6
commit 4dba30ccd0
1 changed files with 0 additions and 9 deletions
--- a/lib/ansible/inventory/init.py
+++ b/lib/ansible/inventory/init.py
@ -533,16 +533,7 @@ class Inventory(object):
        if subset_pattern is None:
            self._subset = None
        else:
-<<<<<<< HEAD
-<<<<<<< HEAD
            subset_patterns = self._split_pattern(subset_pattern)
-=======
-            subset_pattern = subset_pattern.replace(',',':')
-            subset_patterns = self._split_pattern(subset_pattern.replace(";",":"))
->>>>>>> Introduce _split_pattern to parse an "x:y:z" pattern
-=======
-            subset_patterns = self._split_pattern(subset_pattern)
->>>>>>> Don't accept undocumented "p1;p2" patterns; note in changelog
            results = []
            # allow Unix style @filename data
            for x in subset_patterns: