Commit 859706a700e434167e3659455c981407b2f488d7
1 parent
aa4808b6
Exists in
master
and in
2 other branches
Reset migration
Showing
1 changed file
with
0 additions
and
4 deletions
Show diff stats
news/migrations/0001_initial.py
| 1 | # -*- coding: utf-8 -*- | 1 | # -*- coding: utf-8 -*- |
| 2 | -<<<<<<< HEAD | ||
| 3 | -# Generated by Django 1.10.4 on 2017-04-08 01:51 | ||
| 4 | -======= | ||
| 5 | # Generated by Django 1.10.4 on 2017-04-08 00:54 | 2 | # Generated by Django 1.10.4 on 2017-04-08 00:54 |
| 6 | ->>>>>>> 006b4402f3d2aac21ac5426cd255eec9e5cb69a7 | ||
| 7 | from __future__ import unicode_literals | 3 | from __future__ import unicode_literals |
| 8 | 4 | ||
| 9 | import autoslug.fields | 5 | import autoslug.fields |