Fakultas Ilmu Komputer UI

Commit 492a5334 authored by Bimo Iman Smartadi's avatar Bimo Iman Smartadi
Browse files

Fix merge conflict

parent 4156641c
Pipeline #41896 passed with stages
in 66 minutes and 52 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
# Generated by Django 2.1.5 on 2020-04-18 09:06
from django.conf import settings
from django.db import migrations, models
......
......@@ -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',
......
<<<<<<< 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
......
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