合并修复

.idea/MeChat.iml

@@ -14,7 +14,7 @@
   </component>
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.9 (python)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.8" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TemplatesService">

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9 (python)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8" project-jdk-type="Python SDK" />
   <component name="PyCharmProfessionalAdvertiser">
     <option name="shown" value="true" />
   </component>

MeChat/urls.py

@@ -20,6 +20,6 @@ urlpatterns = [
     path('admin/', admin.site.urls),
     path('chat/', include(('chat.urls', "chat"), namespace='chat')),
     path('account/', include(('account.urls', "account"), namespace='account')),
-    path('friends/', include(('friends.urls', "friends"), namespace= 'friends'))
+    path('friends/', include(('friends.urls', "friends"), namespace='friends')),
     path('infrastructure/', include(('infrastructure.urls', "infrastructure"), namespace='infrastructure')),
 ]