Somehow some merge garbage got into the repo.
Removing so `buck test --all` works again.
This appears to have been introduced in:
https://github.com/facebook/buck/commit/e793ed7f2eb0803231264327cf29ca57756d12bd
diff --git a/test/com/facebook/buck/cli/TestCommandTest.java b/test/com/facebook/buck/cli/TestCommandTest.java
index 14f6bac..caba2af 100644
--- a/test/com/facebook/buck/cli/TestCommandTest.java
+++ b/test/com/facebook/buck/cli/TestCommandTest.java
@@ -275,11 +275,6 @@
return new DependencyGraph(graph);
}
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-=======
->>>>>>> d80e841... Add "contacts" as an option to java_test()
/**
* Tests the --xml flag, ensuring that test result data is correctly
* formatted.
@@ -394,10 +389,6 @@
(expectedStr.equals(firstChild.getNodeValue())));
}
-<<<<<<< HEAD
-=======
->>>>>>> Add "contacts" as an option to java_test()
->>>>>>> d80e841... Add "contacts" as an option to java_test()
@Test
public void testGetCandidateRulesByIncludedLabels() throws CmdLineException {
TestRule rule1 = new FakeTestRule(BuildRuleType.JAVA_TEST,
