Last update

BalamiRR · Sep 7, 2022 · 4363b13 · 4363b13
1 parent 8d3a85e
commit 4363b13
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/main/java/com/testinium/runners/CukesRunner.java b/src/main/java/com/testinium/runners/CukesRunner.java
@@ -15,12 +15,8 @@
     features = "src/main/resources/features",
     glue = "com/testinium/step_definitions",
     dryRun = false,
-<<<<<<< HEAD
     tags = "@Smoke"
 
-=======
-    tags = "@Dash"
->>>>>>> feature/Contact
 )
 public class CukesRunner {