Conflict Solved

Merge branch 'Student-20241027' into dev
change main.py
1 changed files with 1 additions and 1 deletions
--- a/.idea/BUAA-SE-2023-Lab01-Group9-remake.iml
+++ b/.idea/BUAA-SE-2023-Lab01-Group9-remake.iml
@ -2,7 +2,7 @@
 <module type="PYTHON_MODULE" version="4">
  <component name="NewModuleRootManager">
    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.8 (study)" jdkType="Python SDK" />
+    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
Author	SHA1	Message	Date
吴鑫宇	4432f17902	Conflict Solved	3 years ago
吴鑫宇	46708dc4fb	Merge branch 'Student-20241027' into dev	3 years ago
吴鑫宇	283bba4469	change main.py	3 years ago