Merge speaker migrations
Two different changes have updated the speaker model; this creates a migration that merges the changes.
This commit is contained in:
		
							parent
							
								
									62df4ec3de
								
							
						
					
					
						commit
						494d9a6add
					
				
					 1 changed files with 16 additions and 0 deletions
				
			
		
							
								
								
									
										16
									
								
								vendor/symposion/speakers/migrations/0005_merge_20170917_1248.py
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										16
									
								
								vendor/symposion/speakers/migrations/0005_merge_20170917_1248.py
									
										
									
									
										vendored
									
									
										Normal file
									
								
							|  | @ -0,0 +1,16 @@ | ||||||
|  | # -*- coding: utf-8 -*- | ||||||
|  | # Generated by Django 1.11.5 on 2017-09-17 02:48 | ||||||
|  | from __future__ import unicode_literals | ||||||
|  | 
 | ||||||
|  | from django.db import migrations | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | class Migration(migrations.Migration): | ||||||
|  | 
 | ||||||
|  |     dependencies = [ | ||||||
|  |         ('symposion_speakers', '0004_auto_20170702_2250'), | ||||||
|  |         ('symposion_speakers', '0004_auto_20170731_2232'), | ||||||
|  |     ] | ||||||
|  | 
 | ||||||
|  |     operations = [ | ||||||
|  |     ] | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 James Polley
						James Polley