Merge branch 'master' of https://gitea.softopia.gku.ac.jp/kitagata/kitagata

.idea/workspace.xml

@@ -25,12 +25,9 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-13315] HP更新依頼（子ども館プロポ）">
-      <change afterPath="$PROJECT_DIR$/fourth/agriculture/pdf/styleA_purchase_eligible_proof.doc" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/agriculture/pdf/styleB_purchase_eligible_proof.doc" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/fourth/agriculture/pdf/styleC_purchase_eligible_proof.doc" afterDir="false" />
+    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-13347] HP更新依頼(東京圏移住支援金）">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/third/living/Agricultural_committee.html" beforeDir="false" afterPath="$PROJECT_DIR$/third/living/Agricultural_committee.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/css/pdf/2seibikeikakusyo_2020.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/css/pdf/2seibikeikakusyo_2020.pdf" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -259,21 +256,10 @@
       <workItem from="1628730755039" duration="148000" />
       <workItem from="1628730915278" duration="5000" />
       <workItem from="1628731694770" duration="1423000" />
-      <workItem from="1629164412357" duration="6173000" />
-    </task>
-    <task id="LOCAL-00103" summary="[kitagata_support-12912] HP更新依頼（北方町議会　日程）">
-      <created>1625209419771</created>
-      <option name="number" value="00103" />
-      <option name="presentableId" value="LOCAL-00103" />
-      <option name="project" value="LOCAL" />
-      <updated>1625209419772</updated>
-    </task>
-    <task id="LOCAL-00104" summary="[kitagata_support-12912] HP更新依頼（北方町議会　日程）">
-      <created>1625449302526</created>
-      <option name="number" value="00104" />
-      <option name="presentableId" value="LOCAL-00104" />
-      <option name="project" value="LOCAL" />
-      <updated>1625449302526</updated>
+      <workItem from="1629164412357" duration="6408000" />
+      <workItem from="1629180358666" duration="108000" />
+      <workItem from="1629249869473" duration="4000" />
+      <workItem from="1629249917771" duration="2226000" />
     </task>
     <task id="LOCAL-00105" summary="[kitagata_support-12994] Re- HP更新依頼（施設整備計画）">
       <created>1625473727226</created>
@@ -604,7 +590,21 @@
       <option name="project" value="LOCAL" />
       <updated>1629170440792</updated>
     </task>
-    <option name="localTasksCounter" value="152" />
+    <task id="LOCAL-00152" summary="[kitagata_support-13332] HP更新依頼【都市環境課】買受適格者証明願">
+      <created>1629171209286</created>
+      <option name="number" value="00152" />
+      <option name="presentableId" value="LOCAL-00152" />
+      <option name="project" value="LOCAL" />
+      <updated>1629171209286</updated>
+    </task>
+    <task id="LOCAL-00153" summary="[kitagata_support-13347] HP更新依頼(東京圏移住支援金）">
+      <created>1629251337901</created>
+      <option name="number" value="00153" />
+      <option name="presentableId" value="LOCAL-00153" />
+      <option name="project" value="LOCAL" />
+      <updated>1629251337901</updated>
+    </task>
+    <option name="localTasksCounter" value="154" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -639,8 +639,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="[kitagata_support-13137] HP更新依頼（北方町議会だより）" />
-    <MESSAGE value="[kitagata_support-13140] 【HP更新依頼】きたがたり" />
     <MESSAGE value="[kitagata_support-13141] 【HP更新依頼】町長のつぶやき" />
     <MESSAGE value="[kitagata_support-13148] HP更新依頼" />
     <MESSAGE value="[kitagata_support-13149] HP更新依頼" />
@@ -664,7 +662,9 @@
     <MESSAGE value="[kitagata_support-13260] 【HP更新依頼】トップページ変更&#10;町長のつぶやき　修正" />
     <MESSAGE value="イベント中止情報　修正" />
     <MESSAGE value="[kitagata_support-13315] HP更新依頼（子ども館プロポ）" />
-    <option name="LAST_COMMIT_MESSAGE" value="[kitagata_support-13315] HP更新依頼（子ども館プロポ）" />
+    <MESSAGE value="[kitagata_support-13332] HP更新依頼【都市環境課】買受適格者証明願" />
+    <MESSAGE value="[kitagata_support-13347] HP更新依頼(東京圏移住支援金）" />
+    <option name="LAST_COMMIT_MESSAGE" value="[kitagata_support-13347] 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/incentives_toyko.html

@@ -216,10 +216,10 @@
             </div>
           </div>
           <span id="template_article_block">
-            総務課<br />
-            Tel 058-323-1111<br />
+            政策財政課<br />
+            Tel 058-322-9936<br />
             FAX 058-323-2963<br />
-            Mail soumu@town.gifu-kitagata.lg.jp
+            Mail seisaku@town.gifu-kitagata.lg.jp
           </span>
         </article>
       </section>
@@ -237,4 +237,4 @@
   <img class="cgipageview" src="http://www.town.kitagata.gifu.jp/cgi-bin/pcount/pcount.cgi?" height="1" width="1" />
 </body>
 
-</html>
+</html>