[kitagata_support/14088] Re/ 【平川】HP更新依頼(保育)

.idea/shelf/2021_10_25_16_44_____Default_Changelist_.xml

@@ -1,4 +0,0 @@
-<changelist name="2021_10_25_16_44_の_更新_前の未コミットの変更_[Default_Changelist]" date="1635147878705" recycled="true" deleted="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/2021_10_25_16_44_の_更新_前の未コミットの変更_[Default_Changelist]/shelved.patch" />
-  <option name="DESCRIPTION" value="2021/10/25 16:44 の 更新 前の未コミットの変更 [Default Changelist]" />
-</changelist>

.idea/workspace.xml

@@ -25,71 +25,7 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-14059] 税金のページの構成変更（修正3）">
-      <change afterPath="$PROJECT_DIR$/fourth/administrative/pdf/Announcement_of_the_number_of_staff_r2.pdf" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/administrative/pdf/Announcement_of_the_number_of_staff_r3.pdf" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/business/electronic_bidding/about_registration.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/business/electronic_bidding/bidder_qualification_number.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/business/electronic_bidding/have_an_IC-card.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/business/electronic_bidding/to_businesses.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/business/qualifying_bidders/construction_surveying_consulting.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/business/qualifying_bidders/goods_etc.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/disaster_infomation/background_regionalization.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/disaster_infomation/broadcast_content.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/disaster_infomation/content_confirmation.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/disaster_infomation/disaster_prevention_infomation.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/disaster_infomation/disaster_prevention_plan.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/disaster_infomation/disaster_prevention_radio.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/disaster_infomation/evacuation_site.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/disaster_infomation/fire_fighting.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/disaster_infomation/hand_book.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/disaster_infomation/hazard_map.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/disaster_infomation/operation_manual.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/disaster_infomation/plan_revision.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/disaster_infomation/precautions.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/disaster_infomation/preparing_regionalization.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/disaster_infomation/realization_wide_area_in_h30.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/disaster_infomation/wide_area_firefighting.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/town_admini_info/infomation_disclosure/can_not_infomation.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/town_admini_info/infomation_disclosure/cost_sharing.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/town_admini_info/infomation_disclosure/how_get_access_infomation.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/town_admini_info/infomation_disclosure/public_and_private_decisions.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/town_admini_info/infomation_disclosure/public_claim.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/town_admini_info/infomation_disclosure/public_town_period.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/town_admini_info/infomation_disclosure/purpose.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/town_admini_info/privacy/privacy_computer_prohibition.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/town_admini_info/privacy/privacy_cost_sharing.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/town_admini_info/privacy/privacy_disclosure_correction_deletion.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/town_admini_info/privacy/privacy_handling_matters.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/town_admini_info/privacy/privacy_maintenance.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/town_admini_info/privacy/privacy_unintended_use.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/town_admini_info/privacy/what_privacy.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/third/Coronavirus/accident_sickness_benefits.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/third/Coronavirus/apply_for_sticker.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/third/Coronavirus/coronavirus_consultation_service.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/third/Coronavirus/coronavirus_procedures.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/third/Coronavirus/for_foreign_residents.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/third/Coronavirus/health_insurance_tax_reduction_exemption_system.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/third/Coronavirus/infection_control_measures_dates.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/third/Coronavirus/kitagata_correspondence.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/third/Coronavirus/patient_outbreak.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/third/Coronavirus/prefectural_governor_message.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/third/Coronavirus/two_masks_distribution.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/fourth/town_admini_info/Announcement_of_the_number_of_staff.html" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/town_admini_info/Announcement_of_the_number_of_staff.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/fourth/town_admini_info/privacy/privacy_protection_purpose.html" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/town_admini_info/privacy/privacy_protection_purpose.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/second/Coronavirus.html" beforeDir="false" afterPath="$PROJECT_DIR$/second/Coronavirus.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/third/business/electronic_bidding.html" beforeDir="false" afterPath="$PROJECT_DIR$/third/business/electronic_bidding.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/third/business/qualifying_bidders.html" beforeDir="false" afterPath="$PROJECT_DIR$/third/business/qualifying_bidders.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/third/emergency_and_disaster_information/Hazard_map.html" beforeDir="false" afterPath="$PROJECT_DIR$/third/emergency_and_disaster_information/Hazard_map.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/third/emergency_and_disaster_information/Regional_disaster_prevention.html" beforeDir="false" afterPath="$PROJECT_DIR$/third/emergency_and_disaster_information/Regional_disaster_prevention.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/third/emergency_and_disaster_information/Shelter_information.html" beforeDir="false" afterPath="$PROJECT_DIR$/third/emergency_and_disaster_information/Shelter_information.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/third/emergency_and_disaster_information/bousai_gyousei_musen.html" beforeDir="false" afterPath="$PROJECT_DIR$/third/emergency_and_disaster_information/bousai_gyousei_musen.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/third/emergency_and_disaster_information/emergency_and_disaster_information.html" beforeDir="false" afterPath="$PROJECT_DIR$/third/emergency_and_disaster_information/emergency_and_disaster_information.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/third/emergency_and_disaster_information/syoubou_kouikika.html" beforeDir="false" afterPath="$PROJECT_DIR$/third/emergency_and_disaster_information/syoubou_kouikika.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/third/town_admini_info/information_disclosure.html" beforeDir="false" afterPath="$PROJECT_DIR$/third/town_admini_info/information_disclosure.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/third/town_admini_info/privacy.html" beforeDir="false" afterPath="$PROJECT_DIR$/third/town_admini_info/privacy.html" afterDir="false" />
-    </list>
+    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-14058] 【再送】HP更新依頼（総務危機管理課）" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -103,7 +39,7 @@
     </option>
   </component>
   <component name="Git.Merge.Settings">
-    <option name="BRANCH" value="master" />
+    <option name="BRANCH" value="feature/kitagata-14058" />
   </component>
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">

fourth/living/Nursery.html

@@ -185,17 +185,6 @@
 						</span>
             </article>
 
-            <article id="template_list_title">
-                <div id="template_title2" class="gothic">
-                    <div id="template_title_block">
-                        <span id="template_title2">町立保育園について</span>
-                    </div>
-                </div>
-                <span id="template_article_block">
-
-						</span>
-            </article>
-
             <article id="template_list_title">
                 <div id="template_title2" class="gothic">
                     <div id="template_title_block">