[cxf] branch 3.2.x-fixes updated: Fixing build

[coheigea]

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/3.2.x-fixes by this push:
     new 3ccccd3  Fixing build
3ccccd3 is described below

commit 3ccccd324b656f83a965a44343e29fcc86b83a21
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Wed May 22 09:37:20 2019 +0100

    Fixing build
---
 .../cxf/transport/servlet/ServletContextResourceResolver.java       | 6 ------
 1 file changed, 6 deletions(-)

diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletContextResourceResolver.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletContextResourceResolver.java
index 2eb88cd..a787294 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletContextResourceResolver.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletContextResourceResolver.java
@@ -107,14 +107,8 @@ public class ServletContextResourceResolver implements 
ResourceResolver {
                     urlMap.put(url.toString(), url);
                     return clz.cast(url);
                 }
-<<<<<<< HEAD
-            } catch (MalformedURLException e1) {
-                //ignore
-            } catch (URISyntaxException e) {
-=======
             } catch (MalformedURLException | URISyntaxException 
                 | IllegalArgumentException e1) {
->>>>>>> d131573... [CXF-8041]Error resolving relative XSD Schema on Tomcat
                 //ignore
             }
         } else if (clz.isAssignableFrom(InputStream.class)) {