Further merge fixes

This commit is contained in:
Joseph Schorr 2015-11-12 21:59:52 -05:00
parent 7816b0c657
commit 030c69d7d2
3 changed files with 22 additions and 28 deletions

View file

@ -576,10 +576,6 @@ class Image(BaseModel):
security_indexed_engine = IntegerField(default=-1)
parent_id = IntegerField(index=True, null=True)
security_indexed = BooleanField(default=False)
security_indexed_engine = IntegerField(default=-1)
parent = ForeignKeyField('self', index=True, null=True, related_name='children')
class Meta:
database = db
read_slaves = (read_slave,)