natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix leftover merge conflicts in build.xml

This commit is contained in:
Tyler Hobbs 2016-08-17 17:33:28 -05:00
parent 1e8533a316
commit 7bdb2dddcb
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.xml
View File

@ -1492,11 +1492,7 @@
</target>
<target name="test-all"
<<<<<<< HEAD
depends="eclipse-warnings,test,long-test,test-compression,stress-test"
=======
depends="eclipse-warnings,test,long-test,test-compression"
>>>>>>> cassandra-3.9
description="Run all tests except for those under test-burn" />
<!-- Use JaCoCo ant extension without needing externally saved lib -->