Merge branch 'master' into farture/12931

# Conflicts:
#	.idea/workspace.xml

.idea/workspace.xml

@@ -25,25 +25,9 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[WIP] 12931 上下水道のページ">
-      <change afterPath="$PROJECT_DIR$/fourth/lifeguide/water/pdf/siyoukaisiidou_2.pdf" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/living/Custumer_infomation.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/living/Jougesuidou_siteiten_meibo.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/living/Procedures_for_designated_sewer.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/living/jougesuidouryoukin.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/living/jougesuidouryoukingenmentetuduki.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/living/tekiseinouhu.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/living/yajirushi.png" afterDir="false" />
+    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-12994] Re- HP更新依頼（施設整備計画）">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/fourth/lifeguide/water/pdf/siteitensinsei_annai.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/lifeguide/water/pdf/siteitensinsei_annai.pdf" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/fourth/living/Procedures_for_designated_supplier.html" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/living/Procedures_for_designated_supplier.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/fourth/living/Procedures_for_water_supply_subscription.html" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/living/Procedures_for_water_supply_subscription.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/fourth/living/Procedures_for_water_supply_use.html" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/living/Procedures_for_water_supply_use.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/fourth/living/Standard_Terms_and_Conditions.html" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/living/Standard_Terms_and_Conditions.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/fourth/living/Standard_Terms_and_Conditions_1.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/living/Standard_Terms_and_Conditions_1.pdf" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/fourth/living/Standard_Terms_and_Conditions_2.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/living/Standard_Terms_and_Conditions_2.pdf" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/fourth/living/Switching_construction_of_sewer.html" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/living/Switching_construction_of_sewer.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/third/living/Application_form.html" beforeDir="false" afterPath="$PROJECT_DIR$/third/living/Application_form.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/second/Child_rearing_and_education.html" beforeDir="false" afterPath="$PROJECT_DIR$/second/Child_rearing_and_education.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -57,13 +41,10 @@
       </list>
     </option>
   </component>
-  <component name="Git.Merge.Settings">
-    <option name="BRANCH" value="master" />
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="master" />
+        <entry key="$PROJECT_DIR$" value="farture/12931" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -116,11 +97,11 @@
       <recent name="$PROJECT_DIR$/third/Public_transport" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/fourth/living" />
-      <recent name="$PROJECT_DIR$/fourth/lifeguide/water/pdf" />
       <recent name="$PROJECT_DIR$/fourth/lifeguide/health/pdf" />
       <recent name="$PROJECT_DIR$/second" />
       <recent name="$PROJECT_DIR$/fourth/education/pdf" />
+      <recent name="$PROJECT_DIR$/css/pdf" />
+      <recent name="$PROJECT_DIR$/css/img" />
     </key>
   </component>
   <component name="RunManager">
@@ -218,7 +199,7 @@
       <workItem from="1625208024248" duration="1464000" />
       <workItem from="1625209723412" duration="1514000" />
       <workItem from="1625448704268" duration="1341000" />
-      <workItem from="1625470168260" duration="2464000" />
+      <workItem from="1625473511168" duration="862000" />
     </task>
     <task id="LOCAL-00057" summary="[kitagata_support-12671] HP更新依頼（図書館）">
       <created>1621242633222</created>
@@ -556,12 +537,12 @@
       <option name="project" value="LOCAL" />
       <updated>1625449302526</updated>
     </task>
-    <task id="LOCAL-00105" summary="[WIP] 12931 上下水道のページ">
-      <created>1625463135516</created>
+    <task id="LOCAL-00105" summary="[kitagata_support-12994] Re- HP更新依頼（施設整備計画）">
+      <created>1625473727226</created>
       <option name="number" value="00105" />
       <option name="presentableId" value="LOCAL-00105" />
       <option name="project" value="LOCAL" />
-      <updated>1625463135516</updated>
+      <updated>1625473727226</updated>
     </task>
     <option name="localTasksCounter" value="106" />
     <servers />
@@ -634,8 +615,8 @@
     <MESSAGE value="[kitagata_support-12934] HP修正依頼（がん患者医療用補正具購入費助成事業）" />
     <MESSAGE value="[kitagata_support-12950] HP更新依頼(先端設備等導入計画）" />
     <MESSAGE value="[kitagata_support-12912] HP更新依頼（北方町議会　日程）" />
-    <MESSAGE value="[WIP] 12931 上下水道のページ" />
-    <option name="LAST_COMMIT_MESSAGE" value="[WIP] 12931 上下水道のページ" />
+    <MESSAGE value="[kitagata_support-12994] Re- HP更新依頼（施設整備計画）" />
+    <option name="LAST_COMMIT_MESSAGE" value="[kitagata_support-12994] Re- 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" />

second/Child_rearing_and_education.html

@@ -395,7 +395,7 @@
                 <span class="template_list">
                   <span class="template_list_img left"><img src="../css/img/smallbutton_secondfloor.png"/></span>
                   <a href="http://www.town.kitagata.gifu.jp/kirari/" target="_blank">
-                    北方町ホリモク生涯学習センター「きらり</a></span><br/>
+                    北方町ホリモク生涯学習センター「きらり」</a></span><br/>
                 <span class="clear"></span>
               </div>
               <div class="template_list">

third/living/kitagata_public_school_facility_development_plan.html

@@ -146,11 +146,11 @@
       <article id="template_list_title" >
         <div id="template_title2" class="gothic">
           <div id="template_title_block">
-            <span id="template_title2">１．整備計画</span>
+            <span id="template_title2">１．施設整備計画</span>
           </div>
         </div>
         <span id="template_article_block">
-						<a href="../../fourth/education/pdf/kitagata_public_school_facility_development_plan.pdf" target="_blank">令和3年度～5年度　北方町公立学校等施設整備計画</a>
+						<a href="../../fourth/education/pdf/kitagata_public_school_facility_development_plan.pdf" target="_blank">令和３年度～令和５年度　北方町公立学校等施設整備計画</a>
 						</span>
       </article>
 

third/parliament/Session_schedule_r3.html

@@ -273,7 +273,7 @@
                     （月）
                   </td>
                   <td valign="top" bgcolor="#dcdcdc" align="left">
-                    <p>　９：３０　　厚生都市常任委員会</p>
+                    <p>９：３０　　厚生都市常任委員会</p>
                     <p>１３：３０　　総務教育常任委員会</p>
                   </td>
                 </tr>
@@ -615,4 +615,4 @@
     height="1" width="1" />
 </body>
 
-</html>
+</html>