From 051ddb617d1c056214081a9768ce43b1c3b1a776 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Thu, 26 Sep 2019 18:20:06 +0300 Subject: [PATCH] fix conflicts after rebase --- apps/establishment/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/establishment/models.py b/apps/establishment/models.py index bebacd18..fcc6abe6 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -8,7 +8,7 @@ from django.contrib.gis.geos import Point from django.contrib.gis.measure import Distance as DistanceMeasure from django.core.exceptions import ValidationError from django.db import models -from django.db.models import When, Case, F, ExpressionWrapper, Subquery +from django.db.models import When, Case, F, ExpressionWrapper, Subquery, Q from django.utils import timezone from django.utils.translation import gettext_lazy as _ from phonenumber_field.modelfields import PhoneNumberField