File tree Expand file tree Collapse file tree 1 file changed +9
-0
lines changed
Expand file tree Collapse file tree 1 file changed +9
-0
lines changed Original file line number Diff line number Diff line change @@ -20,13 +20,22 @@ configurations {
2020
2121dependencies {
2222 " api" (project(" :worldguard-core" ))
23+ <<<<<<< HEAD
2324<<<<<<< HEAD
2425 " compileOnly" (" dev.folia:folia-api:1.19.4-R0.1-SNAPSHOT" )
2526 " runtimeOnly" (" org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT" ) {
2627====== =
2728 " compileOnly" (" io.papermc.paper:paper-api:1.20-R0.1-SNAPSHOT" )
2829 " runtimeOnly" (" org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT" ) {
2930>>>>>>> 16887c85 (deps: Update Paper to 1.20 , snakeyml to 2.0 )
31+ ====== =
32+ " compileOnly" (" io.papermc.paper:paper-api:1.20-R0.1-SNAPSHOT" )
33+ " runtimeOnly" (" org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT" ) {
34+ ====== =
35+ " compileOnly" (" dev.folia:folia-api:1.19.4-R0.1-SNAPSHOT" )
36+ " runtimeOnly" (" org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT" ) {
37+ >>>>>>> f7a59dda (Migrate from paper api to folia for folia schedulers support;)
38+ >>>>>>> 1dbe2914 (Migrate from paper api to folia for folia schedulers support;)
3039 exclude(" junit" , " junit" )
3140 }
3241 " api" (" com.sk89q.worldedit:worldedit-bukkit:${Versions .WORLDEDIT } " ) { isTransitive = false }
You can’t perform that action at this time.
0 commit comments