Bad merge…

Gintas Grigelionis · Gintas Grigelionis · commit 70d8de7ba4d8 · 2018-03-17T22:03:01.000+01:00
diff --git a/src/java/org/apache/ivy/util/XMLHelper.java b/src/java/org/apache/ivy/util/XMLHelper.java
@@ -116,8 +116,8 @@ public static void parse(URL xmlURL, URL schema, DefaultHandler handler) throws
         parse(xmlURL, schema, handler, null);
     }
 
-    public static void parse(URL xmlURL, URL schema, DefaultHandler handler, LexicalHandler lHandler)
     @SuppressWarnings("deprecation")
+    public static void parse(URL xmlURL, URL schema, DefaultHandler handler, LexicalHandler lHandler)
             throws SAXException, IOException, ParserConfigurationException {
         InputStream xmlStream = URLHandlerRegistry.getDefault().openStream(xmlURL);
         try {

Original file line number	Diff line number	Diff line change
`@@ -116,8 +116,8 @@ public static void parse(URL xmlURL, URL schema, DefaultHandler handler) throws`
`116`	`116`	`parse(xmlURL, schema, handler, null);`
`117`	`117`	`}`
`118`	`118`
`119`		`- public static void parse(URL xmlURL, URL schema, DefaultHandler handler, LexicalHandler lHandler)`
`120`	`119`	`@SuppressWarnings("deprecation")`
	`120`	`+ public static void parse(URL xmlURL, URL schema, DefaultHandler handler, LexicalHandler lHandler)`
`121`	`121`	`throws SAXException, IOException, ParserConfigurationException {`
`122`	`122`	`InputStream xmlStream = URLHandlerRegistry.getDefault().openStream(xmlURL);`
`123`	`123`	`try {`