Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

I

idatt1002_2023_9
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

d0fd083f

Commit d0fd083f authored 1 year ago by HSoreide

Downloads
- Patches
- Plain Diff

Resolve conflicts after rebasing onto master

parent 90911f75

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/no/ntnu/idatt1002/demo/controller/AddIngredientController.java 28 additions, 4 deletions

...nu/idatt1002/demo/controller/AddIngredientController.java
src/main/java/no/ntnu/idatt1002/demo/controller/IngredientTileController.java 1 addition, 1 deletion

...u/idatt1002/demo/controller/IngredientTileController.java
src/main/resources/budgets/SelectedBudget.current 1 addition, 1 deletion

src/main/resources/budgets/SelectedBudget.current
src/main/resources/recipes/Fridge.register 4 additions, 0 deletions

src/main/resources/recipes/Fridge.register
src/main/resources/style.css 1 addition, 1 deletion

src/main/resources/style.css
src/main/resources/view/Recipe.fxml 14 additions, 8 deletions

src/main/resources/view/Recipe.fxml

with 49 additions and 15 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment