Merge branch 'master' of https://github.com/lumijiez/ExpenseTrackerFAF into daniel
# Conflicts: # src/main/resources/application.properties
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -32,3 +32,5 @@ build/
|
||||
|
||||
### VS Code ###
|
||||
.vscode/
|
||||
|
||||
!**/src/main/resources/application.properties
|
||||
|
||||
Reference in New Issue
Block a user