fix: TT-402 solve conflict merge

V2/serverless.yml

@@ -89,7 +89,7 @@ functions:
 
   delete_time_entry:
     handler: time_tracker/time_entries/interface.delete_time_entry
-     events:
+    events:
       - http: true
         x-azure-settings:
           methods:

V2/tests/api/azure/time_entry_azure_endpoints_test.py

@@ -1,6 +1,5 @@
 import pytest
 import json
-import pytest
 from faker import Faker
 
 import azure.functions as func

V2/tests/unit/use_cases/time_entries_use_case_test.py

@@ -1,4 +1,3 @@
-from faker import Faker
 from pytest_mock import MockFixture
 from faker import Faker
 

V2/time_tracker/time_entries/_infrastructure/_data_persistence/_time_entries_dao.py

@@ -64,7 +64,6 @@ def delete(self, time_entry_id: int) -> domain.TimeEntry:
         time_entry = self.db.get_session().execute(query_deleted_time_entry).one_or_none()
         return self.__create_time_entry_dto(dict(time_entry)) if time_entry else None
 
-
     def __create_time_entry_dto(self, time_entry: dict) -> domain.TimeEntry:
         time_entry.update({
             "start_date": str(time_entry.get("start_date")),