Permalink
Browse files

Use hamcrest 1.3 (resolve merge conflict)

  • Loading branch information...
1 parent be2d69d commit b6cfc98e929ef8873e2a2d9dfe40336c9b7b62a5 @davidhart82 committed Sep 29, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/test/java/org/junit/tests/experimental/rules/TimeoutRuleTest.java
@@ -2,7 +2,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
-import static org.junit.matchers.JUnitMatchers.containsString;
+import static org.hamcrest.CoreMatchers.containsString;
import java.util.concurrent.TimeUnit;

0 comments on commit b6cfc98

Please sign in to comment.