Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/ConflictTest.java')
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/ConflictTest.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/ConflictTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/ConflictTest.java
index 6eb141b2a..1751719b2 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/ConflictTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/ConflictTest.java
@@ -30,6 +30,7 @@ public class ConflictTest extends JUnitTestCase {
env2 = new SameResultEnv(arg + "checkout2");
}
+ @Override
public void setUp() throws Exception {
env1.setUp();
env2.setUp();
@@ -39,6 +40,7 @@ public class ConflictTest extends JUnitTestCase {
env2.deleteFile("proj2");
}
+ @Override
public void tearDown() throws Exception {
env1.tearDown();
env2.tearDown();

Back to the top