diff options
| author | jon-stumpf <jon.stumpf@gmail.com> | 2017-02-20 10:54:34 -0500 |
|---|---|---|
| committer | jon-stumpf <jon.stumpf@gmail.com> | 2017-02-20 10:54:34 -0500 |
| commit | 888c392af40187f3a0ecc3395495db9acd85b827 (patch) | |
| tree | beb74dff8b8052ffb4a7d3c894b2b4e5a4434973 /test/org/traccar/FilterHandlerTest.java | |
| parent | 38249673287b908c0ca55847a35ca16a7b6a0c50 (diff) | |
| parent | 2449895139fa658d082c1085185003a001225bc3 (diff) | |
| download | traccar-server-888c392af40187f3a0ecc3395495db9acd85b827.tar.gz traccar-server-888c392af40187f3a0ecc3395495db9acd85b827.tar.bz2 traccar-server-888c392af40187f3a0ecc3395495db9acd85b827.zip | |
Resolved conflict with master;
Diffstat (limited to 'test/org/traccar/FilterHandlerTest.java')
| -rw-r--r-- | test/org/traccar/FilterHandlerTest.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/org/traccar/FilterHandlerTest.java b/test/org/traccar/FilterHandlerTest.java index 11b4163a1..452592048 100644 --- a/test/org/traccar/FilterHandlerTest.java +++ b/test/org/traccar/FilterHandlerTest.java @@ -1,14 +1,14 @@ package org.traccar; -import java.util.Date; import org.junit.After; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; import org.junit.Before; import org.junit.Test; -import org.traccar.database.IdentityManager; import org.traccar.model.Position; -import org.traccar.model.Device; + +import java.util.Date; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; public class FilterHandlerTest extends BaseTest { |