Updates post-rebase

grafana · Mar 3, 2025 · c00de92 · c00de92
1 parent 2b06d67
commit c00de92
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/...lter_alertgrouplogrecord_action_source.py → ...lter_alertgrouplogrecord_action_source.py b/...lter_alertgrouplogrecord_action_source.py → ...lter_alertgrouplogrecord_action_source.py
@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('alerts', '0073_update_direct_paging_integration_non_default_routes'),
+        ('alerts', '0074_alter_escalationpolicy_step'),
     ]
 
     operations = [

diff --git a/engine/apps/api/views/features.py b/engine/apps/api/views/features.py
@@ -27,11 +27,8 @@ class Feature(enum.StrEnum):
     LABELS = "labels"
     GOOGLE_OAUTH2 = "google_oauth2"
     SERVICE_DEPENDENCIES = "service_dependencies"
-<<<<<<< HEAD
     PERSONAL_WEBHOOK = "personal_webhook"
-=======
     MATTERMOST = "mattermost"
->>>>>>> 99ba40e8b (Add mattermost OAuth2 flow)
 
 
 class FeaturesAPIView(APIView):