Merge remote-tracking branch 'origin/HS_Add_basic_styling_by_CSS' into HS_Add_basic_styling_by_CSS
# Conflicts: # src/main/java/no/ntnu/idatt1002/demo/controller/AddIngredientController.java # src/main/java/no/ntnu/idatt1002/demo/controller/AllRecipesController.java # src/main/java/no/ntnu/idatt1002/demo/controller/IngredientTileController.java # src/main/resources/recipes/Fridge.register # src/main/resources/style.css # src/main/resources/view/IngredientTile.fxml # src/main/resources/view/Recipe.fxml
No related branches found
No related tags found
Checking pipeline status
Showing
No files found.
Loading
Please register or sign in to comment