Fix bad merge

WordPress · Mar 13, 2024 · 02cf314 · 02cf314
1 parent 7f60bb5
commit 02cf314
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/catalog/dags/elasticsearch_cluster/point_es_alias/point_es_alias_dag.py b/catalog/dags/elasticsearch_cluster/point_es_alias/point_es_alias_dag.py
@@ -38,7 +38,7 @@
 
 
 def point_es_alias_dag(environment: str):
-        dag = DAG(
+    dag = DAG(
         dag_id=f"point_{environment}_alias",
         default_args=DAG_DEFAULT_ARGS,
         schedule=None,

diff --git a/documentation/catalog/reference/DAGs.md b/documentation/catalog/reference/DAGs.md
@@ -1094,18 +1094,14 @@ also delete that index afterward.
 
 This DAG is on a `None` schedule and is run manually.
 
-<<<<<<< HEAD
-### `point_staging_es_alias`
-=======
 ##### Race conditions
 
 Each DAG will fail immediately if any of the DAGs tagged as part of the
 es-concurrency group for the DAG's environment is running. (E.g., the
 `point_staging_alias` DAG fails immediately if any DAGs tagged with
 `staging-es-concurrency` are running.)
 
-### `point_staging_alias`
->>>>>>> be549cdee (Update dag docs)
+### `point_staging_es_alias`
 
 #### Point ES Alias DAG