|
@@ -26,7 +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-13071] HP更新依頼 (電子入札・申請書等)">
|
29
|
|
- <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
|
|
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/Nursery.html" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/living/Nursery.html" afterDir="false" />
|
30
|
31
|
</list>
|
31
|
32
|
<option name="SHOW_DIALOG" value="false" />
|
32
|
33
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -41,12 +42,12 @@
|
41
|
42
|
</option>
|
42
|
43
|
</component>
|
43
|
44
|
<component name="Git.Merge.Settings">
|
44
|
|
- <option name="BRANCH" value="master" />
|
|
45
|
+ <option name="BRANCH" value="feature/130013" />
|
45
|
46
|
</component>
|
46
|
47
|
<component name="Git.Settings">
|
47
|
48
|
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
48
|
49
|
<map>
|
49
|
|
- <entry key="$PROJECT_DIR$" value="feature/13070" />
|
|
50
|
+ <entry key="$PROJECT_DIR$" value="feature/130013" />
|
50
|
51
|
</map>
|
51
|
52
|
</option>
|
52
|
53
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|