From ea6c7680ed5ee051bc1c9f16e0d89ffab0c57717 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Thu, 12 Nov 2020 22:28:54 -0800 Subject: Fix conflicts --- src/main/java/org/traccar/api/BaseObjectResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/org') 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 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 manager = Context.getManager(baseClass); T entity = manager.getById(id); -- cgit v1.2.3