Merge remote repository
This commit is contained in:
1 parent
52b094e992
commit
b11e5c5cb1
4 files changed
+29
-4
No files matched your search
Generated
+25
-2
@@ -1,7 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="AutoImportSettings">
|
||||
<option name="autoReloadType" value="SELECTIVE" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="31921b2f-2e8a-4765-b39a-5173f30d4faf" name="Changes" comment="" />
|
||||
<list default="true" id="31921b2f-2e8a-4765-b39a-5173f30d4faf" name="Changes" comment="first" />
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
@@ -23,12 +26,19 @@
|
||||
"keyToString": {
|
||||
"ModuleVcsDetector.initialDetectionPerformed": "true",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"RunOnceActivity.git.unshallow": "true",
|
||||
"RunOnceActivity.typescript.service.memoryLimit.init": "true",
|
||||
"codeWithMe.voiceChat.enabledByDefault": "false",
|
||||
"git-widget-placeholder": "master",
|
||||
"git-widget-placeholder": "main",
|
||||
"last_opened_file_path": "C:/Users/julia/PycharmProjects/Async",
|
||||
"python.packages.toolwindow.project.migrated.to.right.top.v2": "true"
|
||||
}
|
||||
}]]></component>
|
||||
<component name="RecentsManager">
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="C:\Users\julia\PycharmProjects\Async" />
|
||||
</key>
|
||||
</component>
|
||||
<component name="SharedIndexes">
|
||||
<attachedChunks>
|
||||
<set>
|
||||
@@ -44,9 +54,22 @@
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1794495246989</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="first">
|
||||
<option name="closed" value="true" />
|
||||
<created>1794495507721</created>
|
||||
<option name="number" value="00001" />
|
||||
<option name="presentableId" value="LOCAL-00001" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1794495507721</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="2" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
<option name="version" value="3" />
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<MESSAGE value="first" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="first" />
|
||||
</component>
|
||||
</project>
|
||||
Reference in new issue
Block a user