|
|
@@ -7,15 +7,9 @@
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="fec10672-acda-4616-894b-a4b6f93aea6f" 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$/笔记文件/2.笔记/go相关基础摘要.md" beforeDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/笔记文件/2.笔记/前端开发相关基础摘要.md" beforeDir="false" afterPath="$PROJECT_DIR$/笔记文件/2.笔记/前端开发相关基础摘要.md" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/笔记文件/2.笔记/宏管理器.md" beforeDir="false" afterPath="$PROJECT_DIR$/笔记文件/2.笔记/宏管理器.md" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/笔记文件/日记/2025_09_22_星期一.md" beforeDir="false" afterPath="$PROJECT_DIR$/笔记文件/日记/2025_09_22_星期一.md" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/笔记文件/日记/2025_10_10_星期五.md" beforeDir="false" afterPath="$PROJECT_DIR$/笔记文件/日记/2025_10_10_星期五.md" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/笔记文件/日记/2025_10_14_星期二.md" beforeDir="false" afterPath="$PROJECT_DIR$/笔记文件/日记/2025_10_14_星期二.md" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/笔记文件/日记/2025_10_23_星期四.md" beforeDir="false" afterPath="$PROJECT_DIR$/笔记文件/日记/2025_10_23_星期四.md" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/笔记文件/日记/2025_10_24_星期五.md" beforeDir="false" afterPath="$PROJECT_DIR$/笔记文件/日记/2025_10_24_星期五.md" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/笔记文件/日记/2025_10_26_星期日.md" beforeDir="false" afterPath="$PROJECT_DIR$/笔记文件/日记/2025_10_26_星期日.md" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/笔记文件/日记/2025_10_27_星期一.md" beforeDir="false" afterPath="$PROJECT_DIR$/笔记文件/日记/2025_10_27_星期一.md" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/笔记文件/附件/震动插件.zip" beforeDir="false" afterPath="$PROJECT_DIR$/笔记文件/附件/震动插件.zip" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
@@ -529,7 +523,7 @@
|
|
|
<entry key="branch">
|
|
|
<value>
|
|
|
<list>
|
|
|
- <option value="main" />
|
|
|
+ <option value="origin/main" />
|
|
|
</list>
|
|
|
</value>
|
|
|
</entry>
|