Fakultas Ilmu Komputer UI

Commit 4156641c authored by Bimo Iman Smartadi's avatar Bimo Iman Smartadi
Browse files

Fix merge conflict

parents 41191c83 88284bf1
Pipeline #41084 failed with stages
in 2 minutes and 53 seconds
<<<<<<< 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
from django.conf import settings
from django.db import migrations, models
......
......@@ -41,6 +41,10 @@ INSTALLED_APPS = [
'django.contrib.messages',
'django.contrib.staticfiles',
'django.contrib.auth.hashers',
<<<<<<< HEAD
=======
'login',
>>>>>>> staging
'registrasi',
'informasi_fasilitas',
'new_rest_api',
......
<<<<<<< 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
from django.conf import settings
from django.db import migrations, models
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment