From e23ee006c32ca31afa0dd4bb0b61b126573d9ca6 Mon Sep 17 00:00:00 2001
From: big <youremail@example.com>
Date: Fri, 13 Sep 2024 13:47:19 +0800
Subject: [PATCH] Merge branch 'master' of
 https://git.sairate.top/sairate/doc.git

# Conflicts:
#	notebook/.idea/workspace.xml

Signed-off-by: big <youremail@example.com>
---
 .idea/workspace.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .idea/workspace.xml

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 00000000..67b015d3
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,19 @@
+<?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="02f9b0c7-a97d-4689-afaa-3f6563382100" name="更改" comment="" />
+    <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="ProjectLevelVcsManager">
+    <ConfirmationsSetting value="2" id="Add" />
+  </component>
+  <component name="TaskManager">
+    <servers />
+  </component>
+</project>
\ No newline at end of file