#318 Move Gradle plugin classes to sub package

aim42 · Dec 14, 2024 · d8d118a · d8d118a
1 parent 2c04df5
commit d8d118a
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/...src/test/groovy/org/aim42/htmlsanitycheck/gradle/HtmlSanityCheckTaskFunctionalSpec.groovy b/...src/test/groovy/org/aim42/htmlsanitycheck/gradle/HtmlSanityCheckTaskFunctionalSpec.groovy
@@ -1,5 +1,8 @@
 package org.aim42.htmlsanitycheck.gradle
+<<<<<<<< HEAD:htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/gradle/HtmlSanityCheckTaskFunctionalSpec.groovy
 
+========
+>>>>>>>> f9828f0 (#318 Move Gradle plugin classes to sub package):htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/gradle/HtmlSanityCheckTaskFunctionalTest.groovy
 
 import org.gradle.testkit.runner.GradleRunner
 import org.jsoup.Jsoup