Merge branch 'fil-190' of https://github.com/FidelityInternational/django-cms into fil-190

Anirban Lahiri · Anirban Lahiri · commit 99ffbace6f42 · 2018-07-25T09:05:56.000+01:00
diff --git a/cms/models/placeholdermodel.py b/cms/models/placeholdermodel.py
@@ -41,7 +41,7 @@ class Placeholder(models.Model):
         ContentType,
         blank=True,
         null=True,
-        on_delete=models.SET_NULL
+        on_delete=models.SET_NULL,
     )
     object_id = models.PositiveIntegerField(blank=True, null=True)
     source = GenericForeignKey('content_type', 'object_id')

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ class Placeholder(models.Model):`
`41`	`41`	`ContentType,`
`42`	`42`	`blank=True,`
`43`	`43`	`null=True,`
`44`		`- on_delete=models.SET_NULL`
	`44`	`+ on_delete=models.SET_NULL,`
`45`	`45`	`)`
`46`	`46`	`object_id = models.PositiveIntegerField(blank=True, null=True)`
`47`	`47`	`source = GenericForeignKey('content_type', 'object_id')`