Permalink
Browse files

removed merge markers from one file OOPS

  • Loading branch information...
1 parent f3d727f commit c5022616a582793d1e4a91daa09d09217915960e unknown committed Jul 6, 2011
Showing with 1 addition and 6 deletions.
  1. +1 −6 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

0 comments on commit c502261

Please sign in to comment.