resolve merge conflicts

2022-06-10 08:59:22 -05:00
parent cd4257f13e 3a0efe3eeb
commit e4899d2494
126 changed files with 1459 additions and 299 deletions
--- a/config/urls.py
+++ b/config/urls.py
@@ -17,7 +17,8 @@ urlpatterns = [
    path("accounts/", include("allauth.urls")),
    path("", include("teamsnap.urls")),
    path("", include("instagen.urls")),
-    path("gc/", include("gamechanger.urls"))
+    path("gc/", include("gamechanger.urls")),
+    path("", include("gamecard.urls")),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)