Merge remote-tracking branch 'origin/patch'

Conflicts:
	Ghidra/application.properties
This commit is contained in:
Ryan Kurtz
2023-12-22 10:18:51 -05:00
2 changed files with 9 additions and 7 deletions
+1 -4
View File
@@ -30,10 +30,7 @@
*
*****************************************************************************************/
configurations {
sleighConfig {
// The following line is needed so newer versions of guava can be resolved
attributes.attribute(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, objects.named(TargetJvmEnvironment.class, TargetJvmEnvironment.STANDARD_JVM))
}
sleighConfig
}
dependencies {