Add (existing) ESLint to pre-commit hooks, update JS files to be comp…

…liant
apache · Nov 3, 2020 · 6d36425 · 6d36425
1 parent fe49136
commit 6d36425
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/airflow/www/templates/airflow/dags.html b/airflow/www/templates/airflow/dags.html
@@ -72,7 +72,6 @@ <h2>DAGs</h2>
           </form>
         </div>
       </div>
-<<<<<<< HEAD
       <div class="dags-table-body">
         <table class="table table-striped table-bordered table-hover">
           <thead>