Fakultas Ilmu Komputer UI

Commit bf66ddbe authored by syahbima's avatar syahbima
Browse files

fix merge conflict

parent ff7f8c5e
Pipeline #25165 passed with stages
in 6 minutes and 42 seconds
# -*- coding: utf-8 -*-
# Generated by Django 1.11.17 on 2019-11-15 07:09
from __future__ import unicode_literals
import core.lib.validators
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('core', '0005_merge_20191115_1314'),
]
operations = [
migrations.AlterField(
model_name='student',
name='student_gpa',
field=models.FloatField(blank=True, db_column=b'student_gpa', default=1.0, null=True, validators=[core.lib.validators.validate_student_gpa]),
),
]
Markdown is supported
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