From 2e8d1de0c799c4d8d0befea5a9ea2a92bd034614 Mon Sep 17 00:00:00 2001
From: Aleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Date: Mon, 19 Jan 2026 12:59:24 +0300
Subject: [PATCH] conflict

---
 docker/db/{dev.db-pgsql.env => dev.db-pgsql_before.env} | 0
 docker/php/{dev.php.env => dev.php.before.env}          | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename docker/db/{dev.db-pgsql.env => dev.db-pgsql_before.env} (100%)
 rename docker/php/{dev.php.env => dev.php.before.env} (100%)

diff --git a/docker/db/dev.db-pgsql.env b/docker/db/dev.db-pgsql_before.env
similarity index 100%
rename from docker/db/dev.db-pgsql.env
rename to docker/db/dev.db-pgsql_before.env
diff --git a/docker/php/dev.php.env b/docker/php/dev.php.before.env
similarity index 100%
rename from docker/php/dev.php.env
rename to docker/php/dev.php.before.env
-- 
2.39.5