diff options
| author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-10-22 09:47:50 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-10-22 09:47:50 -0600 |
| commit | 0da328b5ba0dc8bdb3803a85cef150ffc8a69bb7 (patch) | |
| tree | 8bbff8ab6e4f4f7559f2fb35e82bdd88936bc0f5 /askbot/migrations | |
| parent | 780d9e31fb7e42c01c4303f89ac4d53d815de739 (diff) | |
| download | askbot-0da328b5ba0dc8bdb3803a85cef150ffc8a69bb7.tar.gz askbot-0da328b5ba0dc8bdb3803a85cef150ffc8a69bb7.tar.bz2 askbot-0da328b5ba0dc8bdb3803a85cef150ffc8a69bb7.zip | |
bumped conflicted migration number in this branch
Diffstat (limited to 'askbot/migrations')
| -rw-r--r-- | askbot/migrations/0155_add_message_model_in_new_django.py (renamed from askbot/migrations/0154_add_message_model_in_new_django.py) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/askbot/migrations/0154_add_message_model_in_new_django.py b/askbot/migrations/0155_add_message_model_in_new_django.py index 5d60e610..e3fc1df1 100644 --- a/askbot/migrations/0154_add_message_model_in_new_django.py +++ b/askbot/migrations/0155_add_message_model_in_new_django.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# encoding: utf-8 import datetime from south.db import db from south.v2 import SchemaMigration @@ -95,7 +95,7 @@ class Migration(SchemaMigration): 'awarded_count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), 'awarded_to': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'badges'", 'symmetrical': 'False', 'through': "orm['askbot.Award']", 'to': "orm['auth.User']"}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}) + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50', 'db_index': 'True'}) }, 'askbot.draftanswer': { 'Meta': {'object_name': 'DraftAnswer'}, |