Skip to content
Snippets Groups Projects
Forked from Surya Bahadur Kathayat / idatt1002
Source project has a limited visibility.
  • Harry Linrui Xu's avatar
    967f7281
    Merge branch 'master' into 'frontend-testing' · 967f7281
    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
    967f7281
    History
    Merge branch 'master' into 'frontend-testing'
    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