mm

book-rent/src/main/java/com/example/demo/controller/BookController.java

@@ -1,10 +1,10 @@
 package com.example.demo.controller;
 
-<<<<<<< HEAD
 
-public class BookController {
 
-=======
+
+	
+
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -35,5 +35,5 @@ public class BookController {
         model.addAttribute("note", note);
         return "bookList";
     }
->>>>>>> b128e9259883a00e9d25fdaae48e3fe54ddd290a
+
 }

book-rent/src/main/resources/templates/bookList.html

@@ -4,7 +4,7 @@
 <head>
 	<meta charset="UTF-8">
 	<title>書籍一覧</title>
-<<<<<<< HEAD
+
 </head>
 
 <body>
@@ -106,7 +106,7 @@
 
 
 </script>
-=======
+
 <link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
 
@@ -166,6 +166,5 @@
 		</div>
 	</main>
 </body>
->>>>>>> b128e9259883a00e9d25fdaae48e3fe54ddd290a
 
 </html>