diff options
| author | lian-manonog <lian.manonog@gmail.com> | 2024-08-23 11:46:59 +0100 |
|---|---|---|
| committer | lian-manonog <lian.manonog@gmail.com> | 2024-08-23 11:46:59 +0100 |
| commit | 3ff2182b8256594dfbfe7d8c7480d2ee70067ce5 (patch) | |
| tree | dc3ef2dfe2bef7a19b2e24a03aa8f45a1f49279c /tests/test_fact_sales_order.py | |
| parent | 2231ea89329bd500f7371b7395f5208f7a86c20e (diff) | |
| download | de-project-bentley-3ff2182b8256594dfbfe7d8c7480d2ee70067ce5.tar.gz de-project-bentley-3ff2182b8256594dfbfe7d8c7480d2ee70067ce5.zip | |
trying to resolce git index issue conflicts - commiting was the only solution
Diffstat (limited to 'tests/test_fact_sales_order.py')
| -rw-r--r-- | tests/test_fact_sales_order.py | 4 |
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 |