From 482c88cd15a6b79e839e50c1ca69c997b4a779f8 Mon Sep 17 00:00:00 2001
From: Administrator <1280842908@qq.com>
Date: Sun, 22 Mar 2026 13:48:03 +0800
Subject: [PATCH] remove merge conflict markers from .gitignore

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index e798fb31c..8b5f95215 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,9 +60,6 @@ cmd/telegram/
 web/backend/dist/*
 !web/backend/dist/.gitkeep
 
-<<<<<<< HEAD
 .claude/
-=======
 
 docker/data
->>>>>>> upstream-main