Kaynağa Gözat

[kitagata_support/13070] Re/ HP更新依頼 上下水 [WIP] mail.txtの3番について確認中

keyt123 3 yıl önce
ebeveyn
işleme
8bd1f19ab8
1 değiştirilmiş dosya ile 2 ekleme ve 5 silme
  1. 2
    5
      .idea/workspace.xml

+ 2
- 5
.idea/workspace.xml Dosyayı Görüntüle

@@ -25,10 +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-13071] HP更新依頼 (電子入札・申請書等)">
29
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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
-    </list>
28
+    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-13071] HP更新依頼 (電子入札・申請書等)" />
32 29
     <option name="SHOW_DIALOG" value="false" />
33 30
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
34 31
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -42,7 +39,7 @@
42 39
     </option>
43 40
   </component>
44 41
   <component name="Git.Merge.Settings">
45
-    <option name="BRANCH" value="farture/12931" />
42
+    <option name="BRANCH" value="master" />
46 43
   </component>
47 44
   <component name="Git.Settings">
48 45
     <option name="RECENT_BRANCH_BY_REPOSITORY">

Loading…
İptal
Kaydet