From be2e936c935fa8674f09ee3617b1ecfae4b90ff9 Mon Sep 17 00:00:00 2001 From: Gabor Somogyi Date: Wed, 4 May 2016 14:51:30 +0200 Subject: Merge failure fix --- src/org/traccar/api/resource/DeviceResource.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/org') diff --git a/src/org/traccar/api/resource/DeviceResource.java b/src/org/traccar/api/resource/DeviceResource.java index 18c4cb0ce..d7ab3ba24 100644 --- a/src/org/traccar/api/resource/DeviceResource.java +++ b/src/org/traccar/api/resource/DeviceResource.java @@ -33,6 +33,9 @@ import javax.ws.rs.core.Response; import org.traccar.model.Device; +import java.sql.SQLException; +import java.util.Collection; + @Path("devices") @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON) -- cgit v1.2.3