From cb4a93aeabbca4750752cc20f58750019657942c Mon Sep 17 00:00:00 2001
From: Rithvik Sriram <r.sriram-1@student.tudelft.nl>
Date: Thu, 22 Jan 2026 16:12:20 +0100
Subject: [PATCH] Fixed merge conflicts and rebased

---
 .../main/java/client/scenes/Ingredient/IngredientListCtrl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/main/java/client/scenes/Ingredient/IngredientListCtrl.java b/client/src/main/java/client/scenes/Ingredient/IngredientListCtrl.java
index 38e6077..4fec975 100644
--- a/client/src/main/java/client/scenes/Ingredient/IngredientListCtrl.java
+++ b/client/src/main/java/client/scenes/Ingredient/IngredientListCtrl.java
@@ -122,7 +122,7 @@ public class IngredientListCtrl implements LocaleAware {
     @FXML
     private void refresh() {
         try {
-            List<Ingredient> ingredients = server.getIngredients();
+            List<Ingredient> ingredients = server.getIngredients();g
             ingredientListView.getItems().setAll(ingredients);
         } catch (IOException | InterruptedException e) {
             showError("Failed to load ingredients: " + e.getMessage());