feat: TT-418 solve conflicts after add tests

gcobena-dev · gcobena-dev · commit d39c376c0382 · 2021-11-23T12:34:43.000-05:00
diff --git a/V2/time_tracker/customers/_application/_customers/__init__.py b/V2/time_tracker/customers/_application/_customers/__init__.py
@@ -1,2 +1,4 @@
 # flake8: noqa
-from ._create_customer import create_customer
+from ._create_customer import create_customer
+from ._get_customers import get_customers
+from ._delete_customer import delete_customer
diff --git a/V2/time_tracker/customers/_application/_customers/_delete_time_entry.py b/V2/time_tracker/customers/_application/_customers/_delete_time_entry.py
diff --git a/V2/time_tracker/customers/_domain/_persistence_contracts/_customers_dao.py b/V2/time_tracker/customers/_domain/_persistence_contracts/_customers_dao.py
@@ -1,5 +1,5 @@
 import abc
-# import typing
+import typing
 
 from time_tracker.customers._domain import Customer
 
diff --git a/V2/time_tracker/customers/_domain/_services/_customer.py b/V2/time_tracker/customers/_domain/_services/_customer.py
@@ -1,4 +1,4 @@
-# import typing
+import typing
 
 from time_tracker.customers._domain import Customer, CustomersDao
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# import typing`
	`1`	`+import typing`
`2`	`2`
`3`	`3`	`from time_tracker.customers._domain import Customer, CustomersDao`
`4`	`4`