aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test_fact_sales_order.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test_fact_sales_order.py')
-rw-r--r--tests/test_fact_sales_order.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/test_fact_sales_order.py b/tests/test_fact_sales_order.py
index 87e3ade..c4fc9f4 100644
--- a/tests/test_fact_sales_order.py
+++ b/tests/test_fact_sales_order.py
@@ -1,8 +1,12 @@
+<<<<<<< Updated upstream
from src.fact_sales_order import (
create_dim_design,
create_dim_staff,
create_dim_currency,
)
+=======
+from fact_sales_order import create_dim_design, create_dim_staff, create_dim_currency
+>>>>>>> Stashed changes
import pandas as pd
git.ajschof.me — hosted by ajschofield — powered by cgit