Turns out I don't know how to use the GH conflict resolver

metabase · Sep 11, 2024 · 323ea79 · 323ea79
1 parent bcec13b
commit 323ea79
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/test/mb/hawk/core_test.clj b/test/mb/hawk/core_test.clj
@@ -58,7 +58,6 @@
     {:exclude-tags [:exclude-this-test]}
     {:exclude-tags #{:exclude-this-test}}
     {:exclude-tags [:exclude-this-test :another/tag]}))
-<<<<<<< support-only-tags -- Incoming Change
 
 (deftest only-tags-test
   (are [options] (= []
@@ -80,5 +79,3 @@
                     (hawk/find-tests this-ns options))
     {:only-tags [:exclude-this-test]}
     {:only-tags #{:exclude-this-test}}))
-=======
->>>>>>> main -- Current Change