Skip to content
Snippets Groups Projects
Commit 150d985c authored by Zhicheng Xu's avatar Zhicheng Xu
Browse files

111

parent edd26d6b
No related branches found
No related tags found
1 merge request!11xzc merge try
...@@ -5,20 +5,7 @@ ...@@ -5,20 +5,7 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="5d66d739-0810-4bfa-9039-29f5df43a961" name="更改" comment="111"> <list default="true" id="5d66d739-0810-4bfa-9039-29f5df43a961" name="更改" comment="111">
<change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/exercise/.idea/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/exercise/.idea/modules.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/exercise/.idea/webcodegit.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/exercise/689d1554-9651-4cfe-9f2b-49c815ed30e1.webp" afterDir="false" />
<change afterPath="$PROJECT_DIR$/exercise/main.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/exercise/taobao.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/exercise/taobao.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ext ironing/member home page.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ext ironing/memberhomepage.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ext ironing/myteam" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ext ironing/reset.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ext ironing/u=2662935961,3025118511&amp;fm=253&amp;fmt=auto&amp;app=138&amp;f=JPEG.webp" afterDir="false" />
</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" />
...@@ -35,7 +22,28 @@ ...@@ -35,7 +22,28 @@
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
<option name="ROOT_SYNC" value="DONT_SYNC" />
</component> </component>
<component name="GitLabMergeRequestFiltersHistory"><![CDATA[{
"history": [
{
"state": "MERGED",
"assignee": {
"type": "org.jetbrains.plugins.gitlab.mergerequest.ui.filters.GitLabMergeRequestsFiltersValue.MergeRequestsMemberFilterValue.MergeRequestsAssigneeFilterValue",
"username": "c24058946",
"fullname": "Zhicheng Xu"
}
}
],
"lastFilter": {
"state": "MERGED",
"assignee": {
"type": "org.jetbrains.plugins.gitlab.mergerequest.ui.filters.GitLabMergeRequestsFiltersValue.MergeRequestsMemberFilterValue.MergeRequestsAssigneeFilterValue",
"username": "c24058946",
"fullname": "Zhicheng Xu"
}
}
}]]></component>
<component name="GitLabMergeRequestsSettings"><![CDATA[{ <component name="GitLabMergeRequestsSettings"><![CDATA[{
"selectedUrlAndAccountId": { "selectedUrlAndAccountId": {
"first": "https://git.cardiff.ac.uk/c23096663/myteam.git", "first": "https://git.cardiff.ac.uk/c23096663/myteam.git",
...@@ -46,7 +54,7 @@ ...@@ -46,7 +54,7 @@
<setting file="file://$PROJECT_DIR$/taobao.css" root0="SKIP_INSPECTION" /> <setting file="file://$PROJECT_DIR$/taobao.css" root0="SKIP_INSPECTION" />
</component> </component>
<component name="ProblemsViewState"> <component name="ProblemsViewState">
<option name="selectedTabId" value="CurrentFile" /> <option name="selectedTabId" value="QODANA_PROBLEMS_VIEW_TAB" />
</component> </component>
<component name="ProjectColorInfo">{ <component name="ProjectColorInfo">{
&quot;customColor&quot;: &quot;&quot;, &quot;customColor&quot;: &quot;&quot;,
...@@ -92,13 +100,45 @@ ...@@ -92,13 +100,45 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1728398002254</updated> <updated>1728398002254</updated>
<workItem from="1728398003914" duration="4894000" /> <workItem from="1728398003914" duration="4894000" />
<workItem from="1728550406289" duration="9302000" /> <workItem from="1728550406289" duration="9937000" />
</task>
<task id="LOCAL-00001" summary="111">
<option name="closed" value="true" />
<created>1728559850168</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1728559850168</updated>
</task> </task>
<option name="localTasksCounter" value="2" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" /> <option name="version" value="3" />
</component> </component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State>
<option name="FILTERS">
<map>
<entry key="branch">
<value>
<list>
<option value="origin/main" />
</list>
</value>
</entry>
</map>
</option>
</State>
</value>
</entry>
</map>
</option>
</component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="111" /> <MESSAGE value="111" />
<option name="LAST_COMMIT_MESSAGE" value="111" /> <option name="LAST_COMMIT_MESSAGE" value="111" />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment