From 4dba30ccd0a4785761d169e9179b59051107068e Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Thu, 13 Aug 2015 15:05:58 -0400 Subject: [PATCH] Cleanup missed merge conflict sections --- lib/ansible/inventory/__init__.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/lib/ansible/inventory/__init__.py b/lib/ansible/inventory/__init__.py index 5bb6a9f7e7f..5e6e20c8a16 100644 --- 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: