diff options
| author | Gabor Somogyi <Gabor_Somogyi@epam.com> | 2016-05-04 14:51:30 +0200 |
|---|---|---|
| committer | Gabor Somogyi <Gabor_Somogyi@epam.com> | 2016-05-04 14:51:30 +0200 |
| commit | be2e936c935fa8674f09ee3617b1ecfae4b90ff9 (patch) | |
| tree | 28a5baea817013ea6782b9d199fd31b264a8568e | |
| parent | 516ef6a30eb59e1b9c3aa297e3595c5acf665530 (diff) | |
| download | traccar-server-be2e936c935fa8674f09ee3617b1ecfae4b90ff9.tar.gz traccar-server-be2e936c935fa8674f09ee3617b1ecfae4b90ff9.tar.bz2 traccar-server-be2e936c935fa8674f09ee3617b1ecfae4b90ff9.zip | |
Merge failure fix
| -rw-r--r-- | src/org/traccar/api/resource/DeviceResource.java | 3 |
1 files changed, 3 insertions, 0 deletions
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) |