|
@@ -25,10 +25,9 @@
|
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-14502] 【平川】HP更新依頼(子ども館)">
|
|
28
|
+ <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support/14536] HP更新依頼(セーフティネット5号)">
|
29
|
29
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
30
|
|
- <change beforePath="$PROJECT_DIR$/fourth/business/Safety_net_5.html" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/business/Safety_net_5.html" afterDir="false" />
|
31
|
|
- <change beforePath="$PROJECT_DIR$/fourth/business/safety_net_5_industry_table.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/business/safety_net_5_industry_table.pdf" afterDir="false" />
|
|
30
|
+ <change beforePath="$PROJECT_DIR$/css/section_190212.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/section_190212.css" afterDir="false" />
|
32
|
31
|
</list>
|
33
|
32
|
<option name="SHOW_DIALOG" value="false" />
|
34
|
33
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -43,7 +42,7 @@
|
43
|
42
|
</option>
|
44
|
43
|
</component>
|
45
|
44
|
<component name="Git.Merge.Settings">
|
46
|
|
- <option name="BRANCH" value="feature/kitagata-14058" />
|
|
45
|
+ <option name="BRANCH" value="master" />
|
47
|
46
|
</component>
|
48
|
47
|
<component name="Git.Settings">
|
49
|
48
|
<option name="RECENT_BRANCH_BY_REPOSITORY">
|