quick fix

app/vkk/apps.py

 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