aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/test_fact_sales_order.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/test_fact_sales_order.py b/tests/test_fact_sales_order.py
index dad245e..7592f68 100644
--- a/tests/test_fact_sales_order.py
+++ b/tests/test_fact_sales_order.py
@@ -5,10 +5,6 @@ from src.fact_sales_order import (
create_dim_staff,
create_dim_currency,
)
-<< << << < Updated upstream
-== == == =
->>>>>> > Stashed changes
-
class TestCreateDimDesign:
def test_dim_design_returns_dataframe(self):
git.ajschof.me — hosted by ajschofield — powered by cgit