Remove git stash log

HyejiYu · Sep 27, 2024 · f947dcc · f947dcc
1 parent db23f29
commit f947dcc
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/airflow/Oasis_dag.py b/airflow/Oasis_dag.py
@@ -1,6 +1,3 @@
-<<<<<<< Updated upstream
-### dummy
-=======
 from airflow import DAG
 from airflow.decorators import task
 from dotenv import load_dotenv
@@ -76,4 +73,3 @@ def generate_queue_values():
         run_consumer_task,
         send_post_request_OASIS_task.expand(),
     ]
->>>>>>> Stashed changes