From 06a9bd7150c14bbea2316d892fe13ab0b44e6a8b Mon Sep 17 00:00:00 2001
From: apple502j <33279053+apple502j@users.noreply.github.com>
Date: Tue, 9 Apr 2024 18:07:00 +0900
Subject: [PATCH] Fix unfixed merge conflict

---
 .../api/datagen/v1/provider/FabricRecipeProvider.java      | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricRecipeProvider.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricRecipeProvider.java
index 9bdc3fa058..1da3ed2bc2 100644
--- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricRecipeProvider.java
+++ b/fabric-data-generation-api-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()))));
 				}
 			}