Apply spotless to the merge conflict resolution.

nedtwigg · nedtwigg · commit 8f5f0aac11d5 · 2021-11-08T22:03:38.000-08:00
diff --git a/settings.gradle b/settings.gradle
@@ -11,7 +11,7 @@ pluginManagement {
 		id 'com.diffplug.spotless-changelog'       version '2.2.0'
 		// https://github.com/diffplug/goomph/blob/main/CHANGES.md
 		id 'com.diffplug.p2.asmaven'               version '3.33.2'
-    // https://github.com/gradle/test-retry-gradle-plugin/releases
+		// https://github.com/gradle/test-retry-gradle-plugin/releases
 		id 'org.gradle.test-retry'                 version '1.3.1'
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ pluginManagement {`
`11`	`11`	`id 'com.diffplug.spotless-changelog' version '2.2.0'`
`12`	`12`	`// https://github.com/diffplug/goomph/blob/main/CHANGES.md`
`13`	`13`	`id 'com.diffplug.p2.asmaven' version '3.33.2'`
`14`		`- // https://github.com/gradle/test-retry-gradle-plugin/releases`
	`14`	`+ // https://github.com/gradle/test-retry-gradle-plugin/releases`
`15`	`15`	`id 'org.gradle.test-retry' version '1.3.1'`
`16`	`16`	`}`
`17`	`17`	`}`