mrglavas commented on code in PR #100:
URL: https://github.com/apache/xerces-j/pull/100#discussion_r3579440691
##########
build.xml:
##########
@@ -915,11 +916,19 @@ Authors:
classpathref="test.classpath"
failOnError="yes">
</java>
+<<<<<<< HEAD
+ <echo message="Running dom.ids.Test..." />
+ <java fork="yes"
+ classname="dom.ids.Test"
+ classpathref="test.classpath"
+ failOnError="yes">
+=======
<java fork="yes"
classname="dom.range.Test"
classpathref="test.classpath"
failOnError="yes">
<arg value="all"/>
+>>>>>>> main
Review Comment:
Looks like a merge conflict that you were attempting to resolve. The build
is failing because of this.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
