Merge remote-tracking branch 'origin/dependabot/gradle/main/org.freemarker-freemarker-2.3.32'

kobylynskyi · kobylynskyi · commit eefd65f38f7b · 2023-03-30T22:32:58.000-04:00
# Conflicts:
#	build.gradle
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.freemarker:freemarker:2.3.31"
+    compileOnly "org.freemarker:freemarker:2.3.32"
     compileOnly "com.graphql-java:graphql-java:20.2"
     compileOnly "com.fasterxml.jackson.core:jackson-databind:2.14.2"
     compileOnly "com.typesafe:config:1.4.2"

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ repositories {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`dependencies {`
`22`		`- compileOnly "org.freemarker:freemarker:2.3.31"`
	`22`	`+ compileOnly "org.freemarker:freemarker:2.3.32"`
`23`	`23`	`compileOnly "com.graphql-java:graphql-java:20.2"`
`24`	`24`	`compileOnly "com.fasterxml.jackson.core:jackson-databind:2.14.2"`
`25`	`25`	`compileOnly "com.typesafe:config:1.4.2"`