add stashed changes from TaskCont

Author: vmorkhat

.gitignore

@@ -5,6 +5,7 @@ build/
 !**/src/main/**/build/
 !**/src/test/**/build/
 *.db
+*.log
 
 ### Custom ###
 /node/

src/main/java/hexlet/code/controller/TaskController.java

@@ -105,13 +105,7 @@ public TaskDTO updateTask(@RequestBody @Valid TaskDTO dto,
         @ApiResponse(responseCode = "200", description = "The task has been successfully deleted"),
         @ApiResponse(responseCode = "404", description = "The task is not found", content = @Content)})
     @DeleteMapping(path = "/{id}")
-<<<<<<< Updated upstream
-    public void deleteTask(@PathVariable(name = "id") long id,
-                           @AuthenticationPrincipal UserDetails authDetails) {
-        taskService.deleteTask(id, authDetails);
-=======
     public void deleteTask(@PathVariable(name = "id") long id) {
         taskService.deleteTask(id);
->>>>>>> Stashed changes
     }
 }