From 3ff2182b8256594dfbfe7d8c7480d2ee70067ce5 Mon Sep 17 00:00:00 2001
From: lian-manonog <lian.manonog@gmail.com>
Date: Fri, 23 Aug 2024 11:46:59 +0100
Subject: trying to resolce git index issue conflicts - commiting was the only
 solution

---
 tests/test_fact_sales_order.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tests')

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
 
 
-- 
cgit v1.2.3