From a4a5a12d3b7a21b86f7b61113e0272c077ecd7d1 Mon Sep 17 00:00:00 2001 From: Felipe Henrique de Almeida Bormann Date: Fri, 23 Dec 2016 02:08:33 -0300 Subject: [PATCH] commited merged migration --- users/migrations/0004_merge_20161223_0208.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+), 0 deletions(-) create mode 100644 users/migrations/0004_merge_20161223_0208.py diff --git a/users/migrations/0004_merge_20161223_0208.py b/users/migrations/0004_merge_20161223_0208.py new file mode 100644 index 0000000..4ae954d --- /dev/null +++ b/users/migrations/0004_merge_20161223_0208.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-12-23 05:08 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0003_auto_20161222_1806'), + ('users', '0003_auto_20161222_1505'), + ] + + operations = [ + ] -- libgit2 0.21.2