From 15f288c05b316735eefe48de663b230668269157 Mon Sep 17 00:00:00 2001
From: Rhys Nute <nuterd@cardiff.ac.uk>
Date: Fri, 1 Dec 2023 17:57:51 +0000
Subject: [PATCH] Adjusted gradle as stopping bootrun

---
 build.gradle                          |  5 -----
 src/main/resources/QRCodeScanner.html | 10 ++++++++++
 2 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 src/main/resources/QRCodeScanner.html

diff --git a/build.gradle b/build.gradle
index 88324f03..8d359787 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 00000000..11da0658
--- /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
-- 
GitLab