|
@@ -26,8 +26,8 @@
|
26
|
26
|
</component>
|
27
|
27
|
<component name="ChangeListManager">
|
28
|
28
|
<list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-13024] HP更新依頼【都市環境課】おくやみ 犬の死亡">
|
29
|
|
- <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
|
30
|
29
|
<change beforePath="$PROJECT_DIR$/second/Notices.html" beforeDir="false" afterPath="$PROJECT_DIR$/second/Notices.html" afterDir="false" />
|
|
30
|
+ <change beforePath="$PROJECT_DIR$/third/living/Application_form.html" beforeDir="false" afterPath="$PROJECT_DIR$/third/living/Application_form.html" afterDir="false" />
|
31
|
31
|
</list>
|
32
|
32
|
<option name="SHOW_DIALOG" value="false" />
|
33
|
33
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -41,6 +41,9 @@
|
41
|
41
|
</list>
|
42
|
42
|
</option>
|
43
|
43
|
</component>
|
|
44
|
+ <component name="Git.Merge.Settings">
|
|
45
|
+ <option name="BRANCH" value="farture/12931" />
|
|
46
|
+ </component>
|
44
|
47
|
<component name="Git.Settings">
|
45
|
48
|
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
46
|
49
|
<map>
|
|
@@ -203,13 +206,7 @@
|
203
|
206
|
<workItem from="1625717127291" duration="2921000" />
|
204
|
207
|
<workItem from="1625720101409" duration="714000" />
|
205
|
208
|
<workItem from="1625793977584" duration="398000" />
|
206
|
|
- </task>
|
207
|
|
- <task id="LOCAL-00064" summary="[kitagata_support-12704] HP更新依頼()">
|
208
|
|
- <created>1621749675269</created>
|
209
|
|
- <option name="number" value="00064" />
|
210
|
|
- <option name="presentableId" value="LOCAL-00064" />
|
211
|
|
- <option name="project" value="LOCAL" />
|
212
|
|
- <updated>1621749675269</updated>
|
|
209
|
+ <workItem from="1626051954198" duration="257000" />
|
213
|
210
|
</task>
|
214
|
211
|
<task id="LOCAL-00065" summary="[kitagata_support-12706] Re- HP更新依頼(雇用調整助成金)">
|
215
|
212
|
<created>1621749859272</created>
|
|
@@ -547,7 +544,14 @@
|
547
|
544
|
<option name="project" value="LOCAL" />
|
548
|
545
|
<updated>1625719894203</updated>
|
549
|
546
|
</task>
|
550
|
|
- <option name="localTasksCounter" value="113" />
|
|
547
|
+ <task id="LOCAL-00113" summary="12931 topページ修正">
|
|
548
|
+ <created>1626052041390</created>
|
|
549
|
+ <option name="number" value="00113" />
|
|
550
|
+ <option name="presentableId" value="LOCAL-00113" />
|
|
551
|
+ <option name="project" value="LOCAL" />
|
|
552
|
+ <updated>1626052041390</updated>
|
|
553
|
+ </task>
|
|
554
|
+ <option name="localTasksCounter" value="114" />
|
551
|
555
|
<servers />
|
552
|
556
|
</component>
|
553
|
557
|
<component name="TypeScriptGeneratedFilesManager">
|
|
@@ -594,7 +598,6 @@
|
594
|
598
|
</component>
|
595
|
599
|
<component name="VcsManagerConfiguration">
|
596
|
600
|
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
|
597
|
|
- <MESSAGE value="[kitagata_support-12901] 【HP更新依頼】定住奨励金事業" />
|
598
|
601
|
<MESSAGE value="[kitagata_support-12903] HP更新依頼【都市環境課】イベント中止情報" />
|
599
|
602
|
<MESSAGE value="[kitagata_support-12906] HP更新依頼(先端設備等導入計画)" />
|
600
|
603
|
<MESSAGE value="[kitagata_support-12910] 【6月29日までに公開希望です】HP更新依頼【投資表明】" />
|
|
@@ -619,7 +622,8 @@
|
619
|
622
|
<MESSAGE value="[kitagata_support-13016] HP更新依頼(子ども館お便り)" />
|
620
|
623
|
<MESSAGE value="[kitagata_support-13018] HP更新依頼(上下水指定店)" />
|
621
|
624
|
<MESSAGE value="[kitagata_support-13024] HP更新依頼【都市環境課】おくやみ 犬の死亡" />
|
622
|
|
- <option name="LAST_COMMIT_MESSAGE" value="[kitagata_support-13024] HP更新依頼【都市環境課】おくやみ 犬の死亡" />
|
|
625
|
+ <MESSAGE value="12931 topページ修正" />
|
|
626
|
+ <option name="LAST_COMMIT_MESSAGE" value="12931 topページ修正" />
|
623
|
627
|
</component>
|
624
|
628
|
<component name="com.intellij.coverage.CoverageDataManagerImpl">
|
625
|
629
|
<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" />
|