Rebase
This commit is contained in:
parent
8284212b8a
commit
361e407d91
6
.idea/workspace.xml
generated
6
.idea/workspace.xml
generated
@ -4,9 +4,7 @@
|
|||||||
<option name="autoReloadType" value="SELECTIVE" />
|
<option name="autoReloadType" value="SELECTIVE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="bc4dcfec-3698-4fde-a6cf-dd08b73f1f06" name="Default Changelist" comment="">
|
<list default="true" id="bc4dcfec-3698-4fde-a6cf-dd08b73f1f06" name="Default Changelist" comment="" />
|
||||||
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
|
|
||||||
</list>
|
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||||
@ -82,7 +80,7 @@
|
|||||||
<updated>1618145802441</updated>
|
<updated>1618145802441</updated>
|
||||||
<workItem from="1618145805266" duration="1634000" />
|
<workItem from="1618145805266" duration="1634000" />
|
||||||
<workItem from="1618147512704" duration="6933000" />
|
<workItem from="1618147512704" duration="6933000" />
|
||||||
<workItem from="1618246818887" duration="1200000" />
|
<workItem from="1618246818887" duration="17236000" />
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00001" summary="更新 POM 文件">
|
<task id="LOCAL-00001" summary="更新 POM 文件">
|
||||||
<created>1618147556538</created>
|
<created>1618147556538</created>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user