- fixing conflict in XmlUtility.java.

srathod · srathod · commit 541c1a8fbdb0 · 2016-10-03T21:31:19.000+05:30
diff --git a/src/main/java/net/authorize/util/XmlUtility.java b/src/main/java/net/authorize/util/XmlUtility.java
@@ -94,11 +94,7 @@ public static synchronized <T extends Serializable> T create(String xml, Class<T
         	{
         		response_ctx = jaxbContext.get(classType.toString());
         	}
-<<<<<<< .mine
-        	
-=======
-			
->>>>>>> .theirs
+
 	        Unmarshaller um = response_ctx.createUnmarshaller();
 	        try {
 		        Object unmarshaled = um.unmarshal(new StringReader(xml));

Original file line number	Diff line number	Diff line change
`@@ -94,11 +94,7 @@ public static synchronized <T extends Serializable> T create(String xml, Class<T`
`94`	`94`	`{`
`95`	`95`	`response_ctx = jaxbContext.get(classType.toString());`
`96`	`96`	`}`
`97`		`-<<<<<<< .mine`
`98`		`-`
`99`		`-=======`
`100`		`-`
`101`		`->>>>>>> .theirs`
	`97`	`+`
`102`	`98`	`Unmarshaller um = response_ctx.createUnmarshaller();`
`103`	`99`	`try {`
`104`	`100`	`Object unmarshaled = um.unmarshal(new StringReader(xml));`