Просмотр исходного кода

Merge branch 'master' into feature/13158

# Conflicts:
#	.idea/workspace.xml
keyt123 3 лет назад
Родитель
Сommit
5f94eb7e05
2 измененных файлов: 14 добавлений и 19 удалений
  1. 14
    19
      .idea/workspace.xml
  2. Двоичные данные
      third/notices/297_20210802_1.pdf

+ 14
- 19
.idea/workspace.xml Просмотреть файл

@@ -25,11 +25,7 @@
25 25
     <select />
26 26
   </component>
27 27
   <component name="ChangeListManager">
28
-    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support/13143] HP更新依頼(グランドキャビン・公売)8月2日公開 ※一部差し替え">
29
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
30
-      <change beforePath="$PROJECT_DIR$/css/section_190212.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/section_190212.css" afterDir="false" />
31
-      <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
32
-    </list>
28
+    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-13149] HP更新依頼" />
33 29
     <option name="SHOW_DIALOG" value="false" />
34 30
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
35 31
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -48,7 +44,7 @@
48 44
   <component name="Git.Settings">
49 45
     <option name="RECENT_BRANCH_BY_REPOSITORY">
50 46
       <map>
51
-        <entry key="$PROJECT_DIR$" value="master" />
47
+        <entry key="$PROJECT_DIR$" value="feature/130013" />
52 48
       </map>
53 49
     </option>
54 50
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -101,9 +97,9 @@
101 97
       <recent name="$PROJECT_DIR$/third/Public_transport" />
102 98
     </key>
103 99
     <key name="MoveFile.RECENT_KEYS">
100
+      <recent name="$PROJECT_DIR$/css/pdf" />
104 101
       <recent name="$PROJECT_DIR$/css/img" />
105 102
       <recent name="$PROJECT_DIR$/fourth/assembly/pdf" />
106
-      <recent name="$PROJECT_DIR$/css/pdf" />
107 103
       <recent name="$PROJECT_DIR$/fourth/lifeguide/water/pdf" />
108 104
       <recent name="$PROJECT_DIR$/third/notices" />
109 105
     </key>
@@ -226,8 +222,14 @@
226 222
       <workItem from="1627358773518" duration="21000" />
227 223
       <workItem from="1627435559844" duration="706000" />
228 224
       <workItem from="1627458787353" duration="4411000" />
229
-      <workItem from="1627543350697" duration="497000" />
230
-      <workItem from="1627608564292" duration="2912000" />
225
+      <workItem from="1627543350697" duration="312000" />
226
+    </task>
227
+    <task id="LOCAL-00082" summary="[kitagata_support-12869] 修正依頼 Re-  Re-   HP更新依頼(北方町議会>請願陳情)">
228
+      <created>1623824768709</created>
229
+      <option name="number" value="00082" />
230
+      <option name="presentableId" value="LOCAL-00082" />
231
+      <option name="project" value="LOCAL" />
232
+      <updated>1623824768709</updated>
231 233
     </task>
232 234
     <task id="LOCAL-00083" summary="[kitagata_support-12893] HP更新依頼(物品調達方針)">
233 235
       <created>1624412170783</created>
@@ -565,14 +567,7 @@
565 567
       <option name="project" value="LOCAL" />
566 568
       <updated>1627463216787</updated>
567 569
     </task>
568
-    <task id="LOCAL-00131" summary="[kitagata_support-13152] HP更新依頼(子ども館)">
569
-      <created>1627543822409</created>
570
-      <option name="number" value="00131" />
571
-      <option name="presentableId" value="LOCAL-00131" />
572
-      <option name="project" value="LOCAL" />
573
-      <updated>1627543822409</updated>
574
-    </task>
575
-    <option name="localTasksCounter" value="132" />
570
+    <option name="localTasksCounter" value="131" />
576 571
     <servers />
577 572
   </component>
578 573
   <component name="TypeScriptGeneratedFilesManager">
@@ -619,6 +614,7 @@
619 614
   </component>
620 615
   <component name="VcsManagerConfiguration">
621 616
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
617
+    <MESSAGE value="[kitagata_support-13009] HP更新依頼(プレミアム商品券販売)" />
622 618
     <MESSAGE value="[kitagata_support-13010] HP更新依頼(プレミアム商品券取扱店募集)" />
623 619
     <MESSAGE value="[WIP] 12931 ファイルを一部追加" />
624 620
     <MESSAGE value="[kitagata_support-13014] Re- HP更新依頼【削除依頼】(小規模事業者持続化補助金)" />
@@ -643,8 +639,7 @@
643 639
     <MESSAGE value="[kitagata_support-13141] 【HP更新依頼】町長のつぶやき" />
644 640
     <MESSAGE value="[kitagata_support-13148] HP更新依頼" />
645 641
     <MESSAGE value="[kitagata_support-13149] HP更新依頼" />
646
-    <MESSAGE value="[kitagata_support-13152] HP更新依頼(子ども館)" />
647
-    <option name="LAST_COMMIT_MESSAGE" value="[kitagata_support-13152] HP更新依頼(子ども館)" />
642
+    <option name="LAST_COMMIT_MESSAGE" value="[kitagata_support-13149] HP更新依頼" />
648 643
   </component>
649 644
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
650 645
     <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" />

Двоичные данные
third/notices/297_20210802_1.pdf Просмотреть файл


Загрузка…
Отмена
Сохранить