Merge branch 'master' into daniel
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -33,4 +33,4 @@ build/
|
|||||||
### VS Code ###
|
### VS Code ###
|
||||||
.vscode/
|
.vscode/
|
||||||
|
|
||||||
!**/src/main/resources/application.properties
|
/src/main/resources/application.properties
|
||||||
|
|||||||
3
pom.xml
3
pom.xml
@@ -42,9 +42,6 @@
|
|||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-security</artifactId>
|
<artifactId>spring-boot-starter-security</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.projectlombok</groupId>
|
|
||||||
<artifactId>lombok</artifactId>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<build>
|
<build>
|
||||||
|
|||||||
@@ -63,4 +63,4 @@
|
|||||||
// throw new UnsupportedOperationException("Waiting for the DB.");
|
// throw new UnsupportedOperationException("Waiting for the DB.");
|
||||||
// }
|
// }
|
||||||
//
|
//
|
||||||
//}
|
//}
|
||||||
|
|||||||
Reference in New Issue
Block a user