Merge branch 'master' into daniel

2023-09-30 22:18:21 +03:00
parent f235921744 4775911e50
commit 2be3094705
3 changed files with 2 additions and 5 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -33,4 +33,4 @@ build/
 ### VS Code ###
 .vscode/

-!**/src/main/resources/application.properties
+/src/main/resources/application.properties
--- a/pom.xml
+++ b/pom.xml
@@ -42,9 +42,6 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-security</artifactId>
        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
        </dependency>
    </dependencies>
    <build>
--- a/src/main/java/com/faf223/expensetrackerfaf/controller/MainController.java
+++ b/src/main/java/com/faf223/expensetrackerfaf/controller/MainController.java
@@ -63,4 +63,4 @@
 //        throw new UnsupportedOperationException("Waiting for the DB.");
 //    }
 //
-//}
+//}