Compare commits
No commits in common. "262525db57cc93444befc260874e018db6f13c83" and "e8f2a5b6b1b282b2df7b91cc25a07472b59e49f5" have entirely different histories.
262525db57
...
e8f2a5b6b1
|
|
@ -56,4 +56,4 @@ hs_err_pid*
|
|||
replay_pid*
|
||||
|
||||
>>>>>>> gitea/master
|
||||
.idea/*
|
||||
.idea/
|
||||
|
|
@ -5,7 +5,8 @@
|
|||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="45f625e1-36c7-4942-8f7c-ba3ebe9a7d53" name="变更" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/solution/Solution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/solution/Solution.java" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
|
@ -76,7 +77,7 @@
|
|||
<option name="presentableId" value="Default" />
|
||||
<updated>1693822719192</updated>
|
||||
<workItem from="1693822720224" duration="5742000" />
|
||||
<workItem from="1693895305007" duration="5192000" />
|
||||
<workItem from="1693895305007" duration="5131000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
|
|
|||
Loading…
Reference in New Issue