Fix merge conflict

informasi_fasilitas/migrations/0001_initial.py

-<<<<<<< HEAD
-# Generated by Django 2.1.5 on 2020-04-17 13:50
-=======
-# Generated by Django 2.1.5 on 2020-04-17 10:26
->>>>>>> staging
+# Generated by Django 2.1.5 on 2020-04-18 09:06
 
 from django.conf import settings
 from django.db import migrations, models

pplbackend/settings.py

@@ -41,10 +41,6 @@ INSTALLED_APPS = [
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'django.contrib.auth.hashers',
-<<<<<<< HEAD
-=======
-    'login',
->>>>>>> staging
     'registrasi',
     'informasi_fasilitas',
     'new_rest_api',

registrasi/migrations/0001_initial.py

-<<<<<<< HEAD
-# Generated by Django 2.1.5 on 2020-04-17 13:49
-=======
-# Generated by Django 2.1.5 on 2020-04-17 10:27
->>>>>>> staging
+# Generated by Django 2.1.5 on 2020-04-18 09:06
 
 from django.conf import settings
 from django.db import migrations, models