2026_09_5H_Spring_KIZAKI/Monegement
16
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[EDIT]マージ跡を消しました

Browse Source
This commit is contained in:
[IIJ] Naoki Kawahito
2026-09-29 15:13:56 +09:00
parent ead133ba65
commit 78d3042299
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/templates/select_course.html
View File

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