Skip to content
Snippets Groups Projects
Commit ecab207d authored by Andreas Kluge Svendsrud's avatar Andreas Kluge Svendsrud
Browse files

Merge branch 'master' into 'FileHandlingAndreas'

# Conflicts:
#   src/main/java/no/ntnu/idatt1002/demo/data/Budget/BudgetItem.java
#   src/main/java/no/ntnu/idatt1002/demo/data/Economics/Overview.java
parents 274e7624 8dc645d6
No related branches found
No related tags found
1 merge request!33Added exception to BudgetItem constructor and Overview now takes in a Budget
Pipeline #214647 passed with stages
in 1 minute and 45 seconds
Showing
No files found.
with 0 additions and 0 deletions
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment