Commit 4dba30cc by James Cammarata

Cleanup missed merge conflict sections

parent d41db8ed
......@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment