ソースを参照

[WIP] 12931 ファイルを一部追加

keyt123 3年前
コミット
ebf1a956bb
2個のファイルの変更8行の追加5行の削除
  1. 6
    3
      .idea/workspace.xml
  2. 2
    2
      fourth/living/Jougesuidou_siteiten_meibo.html

+ 6
- 3
.idea/workspace.xml ファイルの表示

@@ -27,7 +27,7 @@
27 27
   <component name="ChangeListManager">
28 28
     <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-13010] HP更新依頼(プレミアム商品券取扱店募集)">
29 29
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
30
-      <change beforePath="$PROJECT_DIR$/third/parliament/Session_schedule_r3.html" beforeDir="false" afterPath="$PROJECT_DIR$/third/parliament/Session_schedule_r3.html" afterDir="false" />
30
+      <change beforePath="$PROJECT_DIR$/fourth/living/Jougesuidou_siteiten_meibo.html" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/living/Jougesuidou_siteiten_meibo.html" afterDir="false" />
31 31
     </list>
32 32
     <option name="SHOW_DIALOG" value="false" />
33 33
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -41,10 +41,13 @@
41 41
       </list>
42 42
     </option>
43 43
   </component>
44
+  <component name="Git.Merge.Settings">
45
+    <option name="BRANCH" value="master" />
46
+  </component>
44 47
   <component name="Git.Settings">
45 48
     <option name="RECENT_BRANCH_BY_REPOSITORY">
46 49
       <map>
47
-        <entry key="$PROJECT_DIR$" value="farture/12931" />
50
+        <entry key="$PROJECT_DIR$" value="master" />
48 51
       </map>
49 52
     </option>
50 53
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -97,11 +100,11 @@
97 100
       <recent name="$PROJECT_DIR$/third/Public_transport" />
98 101
     </key>
99 102
     <key name="MoveFile.RECENT_KEYS">
103
+      <recent name="$PROJECT_DIR$/fourth/lifeguide/water/pdf" />
100 104
       <recent name="$PROJECT_DIR$/fourth/notices" />
101 105
       <recent name="$PROJECT_DIR$/fourth/lifeguide/health/pdf" />
102 106
       <recent name="$PROJECT_DIR$/second" />
103 107
       <recent name="$PROJECT_DIR$/fourth/education/pdf" />
104
-      <recent name="$PROJECT_DIR$/css/pdf" />
105 108
     </key>
106 109
   </component>
107 110
   <component name="RunManager">

+ 2
- 2
fourth/living/Jougesuidou_siteiten_meibo.html ファイルの表示

@@ -152,8 +152,8 @@ new google.translate.TranslateElement({pageLanguage: 'ja', layout: google.transl
152 152
     <p class="paragraphT10">
153 153
 <h4 style="border-bottom: 1px solid #426579;border-left: 15px solid #426579;padding: 3px;">令和2年10月1日現在の名簿</h4>
154 154
 指定給水装置工事事業者及び下水道工事指定店<BR/>
155
-   <a href="../lifeguide/water/pdf/shitei_koujisha_20201001.xls">(Excel 107KB)</a>
156
-   <a href="../lifeguide/water/pdf/shitei_koujisha_20201001.pdf" target="_blank">(PDF 204KB)</a>
155
+   <a href="../lifeguide/water/pdf/shitei_koujisha_20210421.xls">(Excel 105KB)</a>
156
+   <a href="../lifeguide/water/pdf/shitei_koujisha_20210421.pdf" target="_blank">(PDF 248KB)</a>
157 157
     </p>
158 158
    </span>
159 159
 

読み込み中…
キャンセル
保存