fixed merge request

build.gradle

@@ -32,9 +32,7 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
-<<<<<<< HEAD
 	
-=======
 
 	implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.0.0'
 
@@ -42,7 +40,6 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-jdbc'
 	implementation 'org.mariadb.jdbc:mariadb-java-client:2.1.2'
 
->>>>>>> b2f5655d9a36a21508f15f6caec5fd3d50d93516
 }
 
 tasks.named('test') {