From 21a21c509769089fda1ef4d7e5e4810bb83344dc Mon Sep 17 00:00:00 2001 From: Tomas Neme Date: Mon, 14 May 2012 13:22:30 -0300 Subject: [PATCH] fix conflicts with master --- .../0005_auto__add_field_customfield_empty_selection_list.py | 1 - helpdesk/migrations/0006_auto__add_field_ticket_tags.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/helpdesk/migrations/0005_auto__add_field_customfield_empty_selection_list.py b/helpdesk/migrations/0005_auto__add_field_customfield_empty_selection_list.py index 3c530523..e34f24de 100644 --- a/helpdesk/migrations/0005_auto__add_field_customfield_empty_selection_list.py +++ b/helpdesk/migrations/0005_auto__add_field_customfield_empty_selection_list.py @@ -182,7 +182,6 @@ class Migration(SchemaMigration): 'modified': ('django.db.models.fields.DateTimeField', [], {'blank': 'True'}), 'on_hold': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'priority': ('django.db.models.fields.IntegerField', [], {'default': '3', 'blank': '3'}), - 'due_date': ('django.db.models.fields.DateTimeField', [], {'blank': 'True', 'null': 'True'}), 'queue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['helpdesk.Queue']"}), 'resolution': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}), diff --git a/helpdesk/migrations/0006_auto__add_field_ticket_tags.py b/helpdesk/migrations/0006_auto__add_field_ticket_tags.py index 3b14f07c..3798c816 100644 --- a/helpdesk/migrations/0006_auto__add_field_ticket_tags.py +++ b/helpdesk/migrations/0006_auto__add_field_ticket_tags.py @@ -101,7 +101,7 @@ class Migration(SchemaMigration): 'helpdesk.followup': { 'Meta': {'ordering': "['date']", 'object_name': 'FollowUp'}, 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 5, 14, 0, 0)'}), + 'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 5, 11, 0, 0)'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'new_status': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), 'public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),