diff --git a/app/vkk/apps.py b/app/vkk/apps.py
index 35b9ae3caf7fcb93b390b5bb54010630ea9c2e3d..b35c53206bea4698c2469d30b61f1baaa5387fdb 100644
--- a/app/vkk/apps.py
+++ b/app/vkk/apps.py
@@ -1,12 +1,6 @@
 from django.apps import AppConfig
 
 
-<<<<<<<< HEAD:prototyp/eigentags/apps.py
-class EigentagsConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'eigentags'
-========
 class VkkConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'vkk'
->>>>>>>> develop:app/vkk/apps.py