merging in updated ptm_list.xml

andreasprlic · andreasprlic · commit 84c1e9cf20fa · 2016-06-10T16:14:27.000-07:00
diff --git a/biojava-modfinder/src/main/resources/org/biojava/nbio/protmod/ptm_list.xml b/biojava-modfinder/src/main/resources/org/biojava/nbio/protmod/ptm_list.xml
@@ -7041,17 +7041,10 @@
 			<Component component="2">
 				<Id source="PDBCC">TY2</Id>
 			</Component>
-<<<<<<< HEAD
 			<Bond>
 				<Atom component="1">CE2</Atom>
 				<Atom component="2">NE2</Atom>
 			</Bond>
-=======
-		   <Bond>
-		    	<Atom component="1">CE2</Atom>
-			    <Atom component="2">NE2</Atom>
-		    </Bond>
->>>>>>> 58c6743... update for 2VH3 TY2
 		</Condition>
 		<Occurrence>hypothetical</Occurrence>
 		<Category>crosslink2</Category>
