[GitHub] eolivelli commented on a change in pull request #3: [MWAR-371] Overlays break first-win rule for web resource with target path ending with '/'

[GitBox <gi...@apache.org>]

eolivelli commented on a change in pull request #3: [MWAR-371] Overlays break first-win rule for web resource with target path ending with '/'
URL: https://github.com/apache/maven-war-plugin/pull/3#discussion_r243768524
 
 

 ##########
 File path: src/it/MWAR-371/custom/src/main/custom/a2.txt
 ##########
 @@ -0,0 +1,21 @@
+<<<<<<< HEAD
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+=======
+>>>>>>> branch 'master' of https://github.com/W-Alphonse/maven-war-plugin.git
 
 Review comment:
   This is the result of a merge conflict?

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services