scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-08-28 05:27:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolving Conflicts

Browse source 
Signed-off-by: feifei <liuyansheng1121@gmail.com>
This commit is contained in:
feifei 2025-03-17 20:15:02 +08:00
parent 104292e19b
commit 05c7245c05
1 changed files with 0 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
.idea/workspace.xml generated
View file

@ -1,78 +0,0 @@
<?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="a805dfbf-0a8b-458a-82ce-2c46cd97e41d" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/webview-ui/src/i18n/locales/vi/chat.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/webview-ui/src/i18n/locales/vi/history.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/webview-ui/src/i18n/locales/vi/mcp.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/webview-ui/src/i18n/locales/vi/prompts.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/webview-ui/src/i18n/locales/vi/settings.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/webview-ui/src/i18n/locales/vi/welcome.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.roomodes" beforeDir="false" afterPath="$PROJECT_DIR$/.roomodes" afterDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/components/settings/SettingsFooter.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/webview-ui/src/components/settings/SettingsFooter.tsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/ar/.gitkeep" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/ar/chat.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/ar/common.json" beforeDir="false" afterPath="$PROJECT_DIR$/webview-ui/src/i18n/locales/vi/common.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/ar/history.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/ar/mcp.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/ar/prompts.json" beforeDir="false" afterPath="$PROJECT_DIR$/webview-ui/src/i18n/locales/ar/prompts.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/ar/settings.json" beforeDir="false" afterPath="$PROJECT_DIR$/webview-ui/src/i18n/locales/ar/settings.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/ar/welcome.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/cs/.gitkeep" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/cs/chat.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/cs/common.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/cs/history.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/cs/mcp.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/cs/prompts.json" beforeDir="false" afterPath="$PROJECT_DIR$/webview-ui/src/i18n/locales/cs/prompts.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/cs/settings.json" beforeDir="false" afterPath="$PROJECT_DIR$/webview-ui/src/i18n/locales/cs/settings.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/cs/welcome.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/hu/.gitkeep" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/hu/chat.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/hu/common.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/hu/history.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/hu/mcp.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/hu/prompts.json" beforeDir="false" afterPath="$PROJECT_DIR$/webview-ui/src/i18n/locales/hu/prompts.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/hu/settings.json" beforeDir="false" afterPath="$PROJECT_DIR$/webview-ui/src/i18n/locales/hu/settings.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/hu/welcome.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/pt/.gitkeep" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/pt/chat.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/pt/common.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/pt/history.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/pt/mcp.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/pt/prompts.json" beforeDir="false" afterPath="$PROJECT_DIR$/webview-ui/src/i18n/locales/pt/prompts.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/pt/settings.json" beforeDir="false" afterPath="$PROJECT_DIR$/webview-ui/src/i18n/locales/pt/settings.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/pt/welcome.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/ru/.gitkeep" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/ru/chat.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/ru/common.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/ru/history.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/ru/mcp.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/ru/prompts.json" beforeDir="false" afterPath="$PROJECT_DIR$/webview-ui/src/i18n/locales/ru/prompts.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/ru/settings.json" beforeDir="false" afterPath="$PROJECT_DIR$/webview-ui/src/i18n/locales/ru/settings.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/webview-ui/src/i18n/locales/ru/welcome.json" beforeDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"git-widget-placeholder": "Merging i18n/fix__missing__settings__and__api",
"node.js.selected.package.tslint": "(autodetect)",
"ts.external.directory.path": "/Users/lys/github/RooVetGit/node_modules/typescript/lib"
}
}]]></component>
<component name="TaskManager">
<servers />
</component>
<component name="VcsManagerConfiguration">
<option name="LAST_COMMIT_MESSAGE" value="" />
</component>
</project>