remove another merge artifact

opencivicdata · Nov 14, 2024 · 1b187f4 · 1b187f4
1 parent 3f85354
commit 1b187f4
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/opencivicdata/core/models/base.py b/opencivicdata/core/models/base.py
@@ -2,10 +2,7 @@
 import re
 import uuid
 from django.db import models
-<<<<<<< Updated upstream
 
-=======
->>>>>>> Stashed changes
 from django.contrib.postgres.fields import ArrayField
 from django.core.validators import RegexValidator