Merge branch 'main' into support-only-tags

metabase · Sep 11, 2024 · bcec13b · bcec13b
2 parents c6686e1 + 199d5f5
commit bcec13b
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/test/mb/hawk/core_test.clj b/test/mb/hawk/core_test.clj
@@ -58,6 +58,7 @@
     {: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] (= []
@@ -79,3 +80,5 @@
                     (hawk/find-tests this-ns options))
     {:only-tags [:exclude-this-test]}
     {:only-tags #{:exclude-this-test}}))
+=======
+>>>>>>> main -- Current Change