解决冲突

df19dbdc · Davve · 96b89357 · 5bc51f02 · df19dbdc
Commit df19dbdc authored Feb 21, 2019 by Davve
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

urls.py api/urls.py +0 -1

No files found.
--- a/api/urls.py
+++ b/api/urls.py
@@ -19,7 +19,6 @@ from .upload import *
 from .token import *
 from .face_star import *
 from .advertise import *
-from .commons import *
 urlpatterns = [
    # 登陆,注销相关