Resolving merge conflict

maykinmedia · Oct 21, 2024 · dd3fe18 · dd3fe18
1 parent 6471e2e
commit dd3fe18
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/open_inwoner/openzaak/migrations/0057_merge_20241021_2201.py b/src/open_inwoner/openzaak/migrations/0057_merge_20241021_2201.py
@@ -0,0 +1,13 @@
+# Generated by Django 4.2.16 on 2024-10-21 20:01
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("openzaak", "0056_openzaakconfig_order_statusses_by_date_set"),
+        ("openzaak", "0056_openzaakconfig_use_zaak_omschrijving_as_title"),
+    ]
+
+    operations = []
diff --git a/src/open_inwoner/openzaak/models.py b/src/open_inwoner/openzaak/models.py
@@ -421,6 +421,8 @@ def form_service(self, service):
             "If not enabled, we show the statuses in the reverse order they are returned via the API, "
             "this because the eSuite does not return the timestamps of the statuses (eSuite, but also "
             "works for Open Zaak)."
+        )
+    )
 
     use_zaak_omschrijving_as_title = models.BooleanField(
         verbose_name=_(