aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2020-11-12 22:28:54 -0800
committerAnton Tananaev <anton.tananaev@gmail.com>2020-11-12 22:28:54 -0800
commitea6c7680ed5ee051bc1c9f16e0d89ffab0c57717 (patch)
tree20941a39f4605ba6c9290c06477eea2e817c6964
parent1c50aac08aa0379cbc4685e95304db77a8401f53 (diff)
downloadtrackermap-server-ea6c7680ed5ee051bc1c9f16e0d89ffab0c57717.tar.gz
trackermap-server-ea6c7680ed5ee051bc1c9f16e0d89ffab0c57717.tar.bz2
trackermap-server-ea6c7680ed5ee051bc1c9f16e0d89ffab0c57717.zip
Fix conflicts
-rw-r--r--src/main/java/org/traccar/api/BaseObjectResource.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/api/BaseObjectResource.java b/src/main/java/org/traccar/api/BaseObjectResource.java
index 50251e7b4..07d631ba6 100644
--- a/src/main/java/org/traccar/api/BaseObjectResource.java
+++ b/src/main/java/org/traccar/api/BaseObjectResource.java
@@ -75,7 +75,7 @@ public abstract class BaseObjectResource<T extends BaseModel> extends BaseResour
@Path("{id}")
@GET
- public Response get(@PathParam("id") long id) throws SQLException {
+ public Response getSingle(@PathParam("id") long id) throws SQLException {
Context.getPermissionsManager().checkPermission(baseClass, getUserId(), id);
BaseObjectManager<T> manager = Context.getManager(baseClass);
T entity = manager.getById(id);