Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/testmycode/tmc-core into …
Browse files Browse the repository at this point in the history
…replaced_urls_@tests

Conflicts:
	src/main/java/fi/helsinki/cs/tmc/core/domain/Exercise.java
	src/test/java/fi/helsinki/cs/tmc/core/commands/SubmitTest.java
	src/test/java/fi/helsinki/cs/tmc/core/communication/ExerciseSubmitterTest.java
	src/test/java/fi/helsinki/cs/tmc/core/communication/SubmissionPollerTest.java
	src/test/java/fi/helsinki/cs/tmc/core/communication/TmcApiTest.java
	src/test/java/fi/helsinki/cs/tmc/core/domain/ReviewTest.java
	src/test/java/fi/helsinki/cs/tmc/core/updates/ReviewHandlerTest.java
  • Loading branch information
wakr committed Sep 12, 2015
2 parents e3a1416 + 097db2e commit b9fca1c
Showing 1 changed file with 0 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

public class SubmissionPollerTest {

Expand Down

0 comments on commit b9fca1c

Please sign in to comment.