gyanaz

src/kszkepzes/settings.py

@@ -39,12 +39,9 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'django_extensions',
     'rest_framework',
-<<<<<<< HEAD
     'stats'
-=======
     'social_django',
     'authsch',
->>>>>>> f31ae04982515a54fa3ce667ce7f5b6aeaf87c00
 ]
 
 MIDDLEWARE = [

src/stats/admin.py

 from django.contrib import admin
-from .models import Profile, Kszk_training
+from .models import Profile, Event
 
 admin.site.register(Profile)
-admin.site.register(Kszk_training)
+admin.site.register(Event)
 # Register your models here.