removed merge markers from one file OOPS

mrgaaron · Jul 6, 2011 · c502261 · c502261
1 parent f3d727f
commit c502261
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/liclient/parsers/lixml.py b/liclient/parsers/lixml.py
@@ -353,10 +353,7 @@ def __build_data(self, tree):
                 data[re.sub('-', '_', n.tag)] = n.getchildren()[0].text
         results = mappers.MemberUrlResource(data, tree)
         return results
-
-<<<<<<< HEAD
-
-=======
+
 class LinkedInSkillsParser(LinkedInXMLParser):
     def __init__(self, content):
         self.tree = content
@@ -376,5 +373,3 @@ def __build_data(self, tree):
         results = mappers.Skills(data, tree)
         return results
 
-
->>>>>>> 775fd061e4f243ae37b4aa1e3b3e6e39c3dacff8