From 989d04167a57be7704ba5c83ec5b5a9ec617c017 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 1 Jun 2026 20:07:48 +0000
Subject: [PATCH] Resolve .gitignore merge conflict with master

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 1cb7bf77..e25b3140 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,7 @@
 .env
 /services/caddy/logs*
 .env.old
+/.tmp/
+/.env.staging
+
+/services/nginx/app/storage/replication-bootstrap.json