Fix unfixed merge conflict

apple502j · Apr 9, 2024 · 06a9bd7 · 06a9bd7
1 parent abb19e9
commit 06a9bd7
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/...pi-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricRecipeProvider.java b/...pi-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricRecipeProvider.java
@@ -106,13 +106,8 @@ public void accept(Identifier recipeId, Recipe<?> recipe, @Nullable AdvancementE
 				list.add(DataProvider.writeToPath(writer, recipeJson, recipesPathResolver.resolveJson(identifier)));
 
 				if (advancement != null) {
-<<<<<<< HEAD
-					JsonObject advancementJson = Util.getResult(Advancement.CODEC.encodeStart(registryOps, advancement.value()), IllegalStateException::new).getAsJsonObject();
-					ResourceCondition.addConditions(advancementJson, conditions);
-=======
 					JsonObject advancementJson = Advancement.CODEC.encodeStart(registryOps, advancement.value()).getOrThrow(IllegalStateException::new).getAsJsonObject();
-					ConditionJsonProvider.write(advancementJson, conditions);
->>>>>>> 9d8968f5a331964b552f22556336b53d99590253
+					ResourceCondition.addConditions(advancementJson, conditions);
 					list.add(DataProvider.writeToPath(writer, advancementJson, advancementsPathResolver.resolveJson(getRecipeIdentifier(advancement.id()))));
 				}
 			}