fix conflict

2026-09-08 04:15:43 +00:00 · 2026-06-22 14:23:43 +03:00
parent 6b1bbd8e59 bc900ce6d4
commit 7f51f24a77
145 changed files with 8199 additions and 9399 deletions
--- a/apps/edr-freight-web/backoffice/src/components/fleet/FleetFormDialog.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/fleet/FleetFormDialog.tsx
@@ -276,7 +276,7 @@ const FleetFormDialog = ({
          <Button variant="default" onClick={() => onOpenChange(false)}>
            Cancel
          </Button>
-          <Button color="green" loading={isSubmitting} onClick={handleSubmit}>
+          <Button color="edr-green" loading={isSubmitting} onClick={handleSubmit}>
            Save
          </Button>
        </Group>