From 78d3042299483443ee5142587aa256ec1660b01d Mon Sep 17 00:00:00 2001
From: n-kawahito <n-kawahito@iij.ad.jp>
Date: Tue, 29 Sep 2026 15:13:56 +0900
Subject: [PATCH 1/3] =?UTF-8?q?[EDIT]=E3=83=9E=E3=83=BC=E3=82=B8=E8=B7=A1?=
 =?UTF-8?q?=E3=82=92=E6=B6=88=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/select_course.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/resources/templates/select_course.html b/src/main/resources/templates/select_course.html
index 35a6f6b..e2a5b43 100644
--- a/src/main/resources/templates/select_course.html
+++ b/src/main/resources/templates/select_course.html
@@ -13,7 +13,6 @@
 	<div th:replace="~{header :: header}"></div>
 	<h1 class="page-title">コース選択</h1>
 
-<<<<<<< HEAD
 	<div class="d-grid gap-2 mt-4">
 	    <th:block th:if="${mode == 'change'}">
 		    <form th:action="@{/course/create}" method="get">
@@ -24,7 +23,6 @@
 	    </th:block>
 	
 	<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" method="post">
-=======
 	<th:block th:if="${mode == 'change'}">
 		<form th:action="@{/course/create}" method="get">
 			<button type="submit">新規登録</button>
@@ -32,7 +30,6 @@
 
 	</th:block>
 	<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" id="totalForm" method="post">
->>>>>>> 65b4a9e54a5bc5c1d1480fd4b9255addf73628e4
 		<button type="submit" class="btn btn-primary w-100">確定</button>
 
 		<div class="accordion" id="accordionExample">

From f319fcb9f8d9087537b12a5aea6d2fbff63a7924 Mon Sep 17 00:00:00 2001
From: kkazuya <kkazuya@iij.ad.jp>
Date: Tue, 29 Sep 2026 15:22:15 +0900
Subject: [PATCH 2/3] =?UTF-8?q?[EDIT]=20=E5=9B=BA=E5=AE=9A=E8=B2=BB?=
 =?UTF-8?q?=E7=99=BB=E9=8C=B2=E3=81=AE=E5=8F=8E=E6=94=AF=E5=8C=BA=E5=88=86?=
 =?UTF-8?q?=E3=81=A8=E3=82=AB=E3=83=86=E3=82=B4=E3=83=AA=E3=83=BC=E3=82=92?=
 =?UTF-8?q?=E5=85=A5=E5=8A=9B=E5=BF=85=E9=A0=88=E3=81=AB=E3=81=97=E3=81=BE?=
 =?UTF-8?q?=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/fixed_cost_create.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/fixed_cost_create.html b/src/main/resources/templates/fixed_cost_create.html
index 0c478d1..8217b49 100644
--- a/src/main/resources/templates/fixed_cost_create.html
+++ b/src/main/resources/templates/fixed_cost_create.html
@@ -37,7 +37,7 @@
 					<div class="mb-3">
 						<label class="form-label" for="transactionType">収入・支出</label>
 
-						<select class="form-select" id="transactionType">
+						<select class="form-select" id="transactionType" required>
 
 							<option value="">選択してください</option>
 							<option value="0">支出</option>
@@ -51,7 +51,7 @@
 					<div class="mb-3">
 						<label class="form-label" for="categoryId">カテゴリ</label>
 
-						<select class="form-select" id="categoryId" th:field="*{categoryId}">
+						<select class="form-select" id="categoryId" th:field="*{categoryId}" required>
 							<option value="">選択してください</option>
 
 							<option class="expenseListClass" th:each="category : ${expenseList}"

From 31b5e540231d182704181327ee8a3b560c690001 Mon Sep 17 00:00:00 2001
From: n-kawahito <n-kawahito@iij.ad.jp>
Date: Tue, 29 Sep 2026 15:31:23 +0900
Subject: [PATCH 3/3] =?UTF-8?q?[FIX]=E3=83=9C=E3=82=BF=E3=83=B3=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=E3=83=9F=E3=82=B9=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=97?=
 =?UTF-8?q?=E3=81=BE=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/select_course.html | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/main/resources/templates/select_course.html b/src/main/resources/templates/select_course.html
index e2a5b43..88419b5 100644
--- a/src/main/resources/templates/select_course.html
+++ b/src/main/resources/templates/select_course.html
@@ -21,12 +21,6 @@
 				</button>
 		    </form>
 	    </th:block>
-	
-	<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" method="post">
-	<th:block th:if="${mode == 'change'}">
-		<form th:action="@{/course/create}" method="get">
-			<button type="submit">新規登録</button>
-		</form>
 
 	</th:block>
 	<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" id="totalForm" method="post">