Fix problem during merge.

738efd1d · afreyssin · c4894a98 · 738efd1d
Commit 738efd1d authored Jun 28, 2010 by afreyssin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

tests/src/joram/connector/ConnectorTest1.java tests/src/joram/connector/ConnectorTest1.java +1 -4

No files found.
--- a/tests/src/joram/connector/ConnectorTest1.java
+++ b/tests/src/joram/connector/ConnectorTest1.java
@@ -211,12 +211,9 @@ public class ConnectorTest1 extends TestCase {
  private static int counter2 = 0;
  private static int counter3 = 0;
  
-<<<<<<< .mine
  public static synchronized void countMessages(String text, int idx) {
    assertTrue("content is null", (text != null));
-=======
-  public static synchronized void countMessages(String text) {
->>>>>>> .r3945
+
    if (text == null) return;
    
    if (text.startsWith("with queue")) {