diff --git a/build.gradle b/build.gradle
index 88324f038029c164be24e9981047807df3da43c9..8d359787ce8628dbb4933c80c53d4a6d91fad470 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,20 +24,15 @@ repositories {
dependencies {
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
implementation 'org.springframework.boot:spring-boot-starter-web'
-<<<<<<< HEAD
implementation 'org.springframework.boot:spring-boot-starter-jdbc'
implementation 'org.mariadb.jdbc:mariadb-java-client:2.1.2'
compileOnly 'org.projectlombok:lombok'
-=======
testImplementation 'org.projectlombok:lombok:1.18.28'
compileOnly 'org.projectlombok:lombok'
->>>>>>> main
developmentOnly 'org.springframework.boot:spring-boot-devtools'
annotationProcessor 'org.projectlombok:lombok'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
implementation 'org.springframework.boot:spring-boot-starter-validation'
-// implementation 'org.springframework.boot:spring-boot-starter-jdbc'
-// implementation 'org.mariadb.jdbc:mariadb-java-client:2.1.2'
}
tasks.named('bootBuildImage') {
diff --git a/src/main/resources/QRCodeScanner.html b/src/main/resources/QRCodeScanner.html
new file mode 100644
index 0000000000000000000000000000000000000000..11da0658b1421e28159c97fc5abae82030ff3630
--- /dev/null
+++ b/src/main/resources/QRCodeScanner.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>QR Camera</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file