fix merge

1 files changed, 2 insertions, 3 deletions

diff --git a/src/test/java/com/juick/tests/ApiTests.java b/src/test/java/com/juick/tests/ApiTests.java
index 7b0264c0..5bd90509 100644
--- a/src/test/java/com/juick/tests/ApiTests.java
+++ b/src/test/java/com/juick/tests/ApiTests.java
@@ -7,8 +7,7 @@ import com.juick.server.MessagesQueries;
 import com.juick.server.SubscriptionsQueries;
 import com.juick.server.TagQueries;
 import com.juick.server.UserQueries;
-import junit.framework.Assert;
-import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -92,7 +91,7 @@ public class ApiTests {
     }
 
     
-    @Test 
+    @Test
     public void messageTests() {
         int user_id = UserQueries.createUser(jdbc, "me", "secret");
         User user = UserQueries.getUserByUID(jdbc, user_id);