Merge pull request #171 from celery/revert-167-master

Revert "Fix interval & solar validation"

Author: Omer Katz

django_celery_beat/models.py

@@ -325,7 +325,7 @@ def validate_unique(self, *args, **kwargs):
             raise ValidationError({
                 'crontab': [err_msg]
             })
-        if self.interval and self.solar:
+        if self.interval or self.solar:
             raise ValidationError({
                 'solar': [err_msg]
             })