yixiong/platform-prototype
17
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

冲突

Browse Source
This commit is contained in:
fengpu
2026-06-03 10:55:54 +08:00
parent a3a5fcd0f9 871a2d46ce
commit 4d4240d1c4
86 changed files with 8761 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/claudeCodeTabState.xml
Generated
+17
View File
@@ -7,7 +7,23 @@
<value>
<TabSessionState>
<option name="provider" value="claude" />
<<<<<<< HEAD
<option name="sessionId" value="1d078eed-20f6-479f-ad7e-15325609b54e" />
=======
<option name="sessionId" value="91da2830-34f5-4d7d-aa52-2f2559a1f54f" />
<option name="cwd" value="$PROJECT_DIR$" />
<option name="model" value="claude-opus-4-7[1m]" />
<option name="permissionMode" value="bypassPermissions" />
<option name="reasoningEffort" value="high" />
</TabSessionState>
</value>
</entry>
<entry key="1">
<value>
<TabSessionState>
<option name="provider" value="claude" />
<option name="sessionId" value="3020263d-842c-4508-accd-dd719bd76d8b" />
>>>>>>> 871a2d46ce5c80d603f58817e2096ed7076ad713
<option name="cwd" value="$PROJECT_DIR$" />
<option name="model" value="claude-opus-4-7[1m]" />
<option name="permissionMode" value="bypassPermissions" />
@@ -17,5 +33,6 @@
</entry>
</map>
</option>
<option name="tabCount" value="2" />
</component>
</project>