Merge branch 'master' into feature/13158

# Conflicts:
#	.idea/workspace.xml

.idea/workspace.xml

@@ -25,11 +25,7 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support/13143] HP更新依頼（グランドキャビン・公売）８月２日公開　※一部差し替え">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css/section_190212.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/section_190212.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
-    </list>
+    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-13149] HP更新依頼" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -48,7 +44,7 @@
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="master" />
+        <entry key="$PROJECT_DIR$" value="feature/130013" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -101,9 +97,9 @@
       <recent name="$PROJECT_DIR$/third/Public_transport" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/css/pdf" />
       <recent name="$PROJECT_DIR$/css/img" />
       <recent name="$PROJECT_DIR$/fourth/assembly/pdf" />
-      <recent name="$PROJECT_DIR$/css/pdf" />
       <recent name="$PROJECT_DIR$/fourth/lifeguide/water/pdf" />
       <recent name="$PROJECT_DIR$/third/notices" />
     </key>
@@ -226,8 +222,14 @@
       <workItem from="1627358773518" duration="21000" />
       <workItem from="1627435559844" duration="706000" />
       <workItem from="1627458787353" duration="4411000" />
-      <workItem from="1627543350697" duration="497000" />
-      <workItem from="1627608564292" duration="2912000" />
+      <workItem from="1627543350697" duration="312000" />
+    </task>
+    <task id="LOCAL-00082" summary="[kitagata_support-12869] 修正依頼　Re-  Re-   HP更新依頼（北方町議会＞請願陳情）">
+      <created>1623824768709</created>
+      <option name="number" value="00082" />
+      <option name="presentableId" value="LOCAL-00082" />
+      <option name="project" value="LOCAL" />
+      <updated>1623824768709</updated>
     </task>
     <task id="LOCAL-00083" summary="[kitagata_support-12893] HP更新依頼（物品調達方針）">
       <created>1624412170783</created>
@@ -565,14 +567,7 @@
       <option name="project" value="LOCAL" />
       <updated>1627463216787</updated>
     </task>
-    <task id="LOCAL-00131" summary="[kitagata_support-13152] HP更新依頼（子ども館）">
-      <created>1627543822409</created>
-      <option name="number" value="00131" />
-      <option name="presentableId" value="LOCAL-00131" />
-      <option name="project" value="LOCAL" />
-      <updated>1627543822409</updated>
-    </task>
-    <option name="localTasksCounter" value="132" />
+    <option name="localTasksCounter" value="131" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -619,6 +614,7 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
+    <MESSAGE value="[kitagata_support-13009] HP更新依頼（プレミアム商品券販売）" />
     <MESSAGE value="[kitagata_support-13010] HP更新依頼（プレミアム商品券取扱店募集）" />
     <MESSAGE value="[WIP]　12931 ファイルを一部追加" />
     <MESSAGE value="[kitagata_support-13014] Re- HP更新依頼【削除依頼】（小規模事業者持続化補助金）" />
@@ -643,8 +639,7 @@
     <MESSAGE value="[kitagata_support-13141] 【HP更新依頼】町長のつぶやき" />
     <MESSAGE value="[kitagata_support-13148] HP更新依頼" />
     <MESSAGE value="[kitagata_support-13149] HP更新依頼" />
-    <MESSAGE value="[kitagata_support-13152] HP更新依頼（子ども館）" />
-    <option name="LAST_COMMIT_MESSAGE" value="[kitagata_support-13152] HP更新依頼（子ども館）" />
+    <option name="LAST_COMMIT_MESSAGE" value="[kitagata_support-13149] HP更新依頼" />
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
     <SUITE FILE_PATH="coverage/kitagata$.dat" NAME="更新用 Coverage Results" MODIFIED="1569418362637" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="WipCoverageRunner" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />