From 29362b9e24b0fff6f9d2d9db1a9bb409ee5c02cc Mon Sep 17 00:00:00 2001
From: Chif Gergo <chifgeri97@gmail.com>
Date: Tue, 3 Oct 2017 22:43:04 +0200
Subject: [PATCH] gyanaz
---
src/kszkepzes/settings.py | 3 ---
src/stats/admin.py | 4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/kszkepzes/settings.py b/src/kszkepzes/settings.py
index 2191c8b..ea5176c 100644
--- a/src/kszkepzes/settings.py
+++ b/src/kszkepzes/settings.py
@@ -39,12 +39,9 @@ INSTALLED_APPS = [
'django.contrib.staticfiles',
'django_extensions',
'rest_framework',
-<<<<<<< HEAD
'stats'
-=======
'social_django',
'authsch',
->>>>>>> f31ae04982515a54fa3ce667ce7f5b6aeaf87c00
]
MIDDLEWARE = [
diff --git a/src/stats/admin.py b/src/stats/admin.py
index 9216300..31d1790 100644
--- a/src/stats/admin.py
+++ b/src/stats/admin.py
@@ -1,6 +1,6 @@
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.
--
GitLab