Fixed merge conflicts and rebased

This commit is contained in:
Rithvik Sriram 2026-01-22 16:12:20 +01:00
commit cb4a93aeab

View file

@ -122,7 +122,7 @@ public class IngredientListCtrl implements LocaleAware {
@FXML @FXML
private void refresh() { private void refresh() {
try { try {
List<Ingredient> ingredients = server.getIngredients(); List<Ingredient> ingredients = server.getIngredients();g
ingredientListView.getItems().setAll(ingredients); ingredientListView.getItems().setAll(ingredients);
} catch (IOException | InterruptedException e) { } catch (IOException | InterruptedException e) {
showError("Failed to load ingredients: " + e.getMessage()); showError("Failed to load ingredients: " + e.getMessage());