Forked from
Surya Bahadur Kathayat / idatt1002
25 commits behind, 260 commits ahead of the upstream repository.
Harry Linrui Xu
authored
# Conflicts: # src/main/java/no/ntnu/idatt1002/demo/controller/AddBudgetController.java # src/main/java/no/ntnu/idatt1002/demo/controller/AddExpenseController.java # src/main/java/no/ntnu/idatt1002/demo/controller/AddIncomeController.java # src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java # src/main/java/no/ntnu/idatt1002/demo/controller/FinanceController.java # src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java # src/main/java/no/ntnu/idatt1002/demo/controller/MainMenu.java # src/main/java/no/ntnu/idatt1002/demo/controller/SceneController.java # src/main/resources/Economics/Income.register # src/main/resources/view/IncomeAndExpenses.fxml