合并 nch_branch 到 develop,解决冲突

pull/18/head
djq 4 months ago
parent 457900b3c2
commit dfc09e23f1

@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/Django.iml" filepath="$PROJECT_DIR$/.idea/Django.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/software-engineering-methodology-nch-branch.iml" filepath="$PROJECT_DIR$/.idea/software-engineering-methodology-nch-branch.iml" />
</modules>
</component>
</project>

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="jdk" jdkName="Python 3.12" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="PyDocumentationSettings">
<option name="format" value="PLAIN" />
<option name="myDocStringFormat" value="Plain" />
</component>
</module>
Loading…
Cancel
Save