Fakultas Ilmu Komputer UI

Commit 55b18ebc authored by Fajrin Kingwijati's avatar Fajrin Kingwijati
Browse files

Merge branch '1606837631-hotfix-migrations_conflict' into 'master'

1606837631-fix conflict on database migration

See merge request !10
parents 6227c703 4c82b1b6
Pipeline #21854 passed with stages
in 196 minutes and 17 seconds
# -*- coding: utf-8 -*-
# Generated by Django 1.10.5 on 2019-10-05 12:26
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('core', '0014_feedback'),
('core', '0014_company_category'),
]
operations = [
]
# -*- coding: utf-8 -*-
# Generated by Django 1.10.5 on 2019-10-05 15:35
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('core', '0015_merge_20191005_1926'),
('core', '0015_merge_20191005_1957'),
]
operations = [
]
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