Gitlink
/
forgeplus-react
32
0
Fork 29
Code Issues Pull Requests Releases 1 Wiki Activity

issue

This commit is contained in:
hc1913847458 2021-09-02 10:02:54 +08:00 committed by caishi
parent b26f300832
commit 97e6a5d5f2
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.idea/workspace.xml
View File

@ -4,8 +4,17 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<<<<<<< HEAD
<list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment=""> <list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/public/css/edu-purge.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/css/edu-purge.css" afterDir="false" /> <change beforePath="$PROJECT_DIR$/public/css/edu-purge.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/css/edu-purge.css" afterDir="false" />
=======
<list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="色值修改">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/CoderDepotReadme.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/CoderDepotReadme.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/list.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/list.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/list.css.map" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/list.css.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/list.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/list.scss" afterDir="false" />
>>>>>>> issue
</list> </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" />
@ -348,12 +357,17 @@
======= =======
<workItem from="1630023942152" duration="459000" /> <workItem from="1630023942152" duration="459000" />
<workItem from="1630024424307" duration="17223000" /> <workItem from="1630024424307" duration="17223000" />
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<workItem from="1630372816729" duration="42897000" /> <workItem from="1630372816729" duration="42897000" />
<workItem from="1630545632975" duration="297000" /> <workItem from="1630545632975" duration="297000" />
======= =======
<workItem from="1630372816729" duration="34627000" /> <workItem from="1630372816729" duration="34627000" />
>>>>>>> 3a27fbd47bf8b9e73dad8b02d43bf52d6b5b5e8a >>>>>>> 3a27fbd47bf8b9e73dad8b02d43bf52d6b5b5e8a
>>>>>>> issue
=======
<workItem from="1630372816729" duration="42897000" />
<workItem from="1630545632975" duration="297000" />
>>>>>>> issue >>>>>>> issue
</task> </task>
<servers /> <servers />