|
@@ -26,14 +26,9 @@
|
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-14502] 【平川】HP更新依頼(子ども館)">
|
29
|
|
- <change afterPath="$PROJECT_DIR$/fourth/lifeguide/tax/pdf/Final_tax_return_R3_1.pdf" afterDir="false" />
|
30
|
|
- <change afterPath="$PROJECT_DIR$/fourth/lifeguide/tax/pdf/Final_tax_return_R3_2.pdf" afterDir="false" />
|
31
|
29
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
32
|
|
- <change beforePath="$PROJECT_DIR$/fourth/tax/Final_tax_return_About.html" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/tax/Final_tax_return_About.html" afterDir="false" />
|
33
|
|
- <change beforePath="$PROJECT_DIR$/fourth/tax/Final_tax_return_Martha.html" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/tax/Final_tax_return_Martha.html" afterDir="false" />
|
34
|
|
- <change beforePath="$PROJECT_DIR$/fourth/tax/Final_tax_return_Trouble.html" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/tax/Final_tax_return_Trouble.html" afterDir="false" />
|
35
|
|
- <change beforePath="$PROJECT_DIR$/fourth/tax/Tax_filing_About.html" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/tax/Tax_filing_About.html" afterDir="false" />
|
36
|
|
- <change beforePath="$PROJECT_DIR$/fourth/tax/Tax_filing_Consultation_venue.html" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/tax/Tax_filing_Consultation_venue.html" 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" />
|
37
|
32
|
</list>
|
38
|
33
|
<option name="SHOW_DIALOG" value="false" />
|
39
|
34
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -53,7 +48,7 @@
|
53
|
48
|
<component name="Git.Settings">
|
54
|
49
|
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
55
|
50
|
<map>
|
56
|
|
- <entry key="$PROJECT_DIR$" value="master" />
|
|
51
|
+ <entry key="$PROJECT_DIR$" value="feature/14535" />
|
57
|
52
|
</map>
|
58
|
53
|
</option>
|
59
|
54
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
@@ -109,11 +104,11 @@
|
109
|
104
|
<recent name="$PROJECT_DIR$/third/Public_transport" />
|
110
|
105
|
</key>
|
111
|
106
|
<key name="MoveFile.RECENT_KEYS">
|
|
107
|
+ <recent name="$PROJECT_DIR$/fourth/business" />
|
112
|
108
|
<recent name="$PROJECT_DIR$/fourth/lifeguide/tax/pdf" />
|
113
|
109
|
<recent name="$PROJECT_DIR$/css/pdf/childrens_museum" />
|
114
|
110
|
<recent name="$PROJECT_DIR$/fourth/town_admini_info/financial_results" />
|
115
|
111
|
<recent name="$PROJECT_DIR$/third/publicity_1/r3" />
|
116
|
|
- <recent name="$PROJECT_DIR$/third/publicity_1/new" />
|
117
|
112
|
</key>
|
118
|
113
|
</component>
|
119
|
114
|
<component name="RunManager">
|