fix conflict from main

Paperz-org · Feb 17, 2024 · 3259ce6 · 3259ce6
2 parents 039fef0 + d3f3104
commit 3259ce6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/blitz/cli/commands/release.py b/blitz/cli/commands/release.py
@@ -38,6 +38,6 @@ def release_blitz(
     except MigrationNoChangesDetectedError:
         raise NoChangesDetectedError()
 
-    print(f"Blitz app {blitz_app_name} released at version {new_version}")
+    print(f"Blitz app {blitz_app.name} released at version {new_version}")
     print("You can now start your versioned blitz app by running:")
-    print(f"    [bold medium_purple1]blitz start {blitz_app_name} --version {new_version}[/bold medium_purple1]")
+    print(f"    [bold medium_purple1]blitz start {blitz_app.name} --version {new_version}[/bold medium_purple1]")
diff --git a/blitz/models/blitz/field.py b/blitz/models/blitz/field.py
@@ -2,7 +2,7 @@
 from blitz.models.utils import ContainsEnum
 from typing import Any, ClassVar
 
-from pydantic import BaseModel, Field, computed_field, field_validator, model_serializer
+from pydantic import BaseModel, computed_field, field_validator, model_serializer, Field
 import uuid
 from datetime import datetime
 import logging