Fix merge issues

breskeby · breskeby · commit 8032cd01cf49 · 2025-10-13T06:49:41.000+02:00
diff --git a/modules/repository-s3/build.gradle b/modules/repository-s3/build.gradle
@@ -68,7 +68,6 @@ restResources {
   }
 }
 
-<<<<<<< HEAD
 tasks.withType(AbstractDependenciesTask).configureEach {
   mapping from: /aws-java-sdk-.*/, to: 'aws-java-sdk'
   mapping from: /jmespath-java.*/, to: 'aws-java-sdk'

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ restResources {`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`71`		`-<<<<<<< HEAD`
`72`	`71`	`tasks.withType(AbstractDependenciesTask).configureEach {`
`73`	`72`	`mapping from: /aws-java-sdk-.*/, to: 'aws-java-sdk'`
`74`	`73`	`mapping from: /jmespath-java.*/, to: 'aws-java-sdk'`