From b3e8308f21ff9b0fbfb187c6c1f26ef3e9c42504 Mon Sep 17 00:00:00 2001 From: alireza Date: Tue, 2 Jun 2026 15:38:41 +0330 Subject: [PATCH] Fix gitattributes merge conflict marker Co-Authored-By: Claude Sonnet 4.6 --- .gitattributes | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.gitattributes b/.gitattributes index b47faf3..9be86bc 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ +<<<<<<< HEAD *.mp4 filter=lfs diff=lfs merge=lfs -text public/1.jpg filter=lfs diff=lfs merge=lfs -text public/10.jpg filter=lfs diff=lfs merge=lfs -text @@ -15,3 +16,23 @@ public/9.jpg filter=lfs diff=lfs merge=lfs -text public/موکاپ-1.jpg filter=lfs diff=lfs merge=lfs -text public/news/*.jpg filter=lfs diff=lfs merge=lfs -text public/logo.png filter=lfs diff=lfs merge=lfs -text +======= +*.mp4 filter=lfs diff=lfs merge=lfs -text +public/1.jpg filter=lfs diff=lfs merge=lfs -text +public/10.jpg filter=lfs diff=lfs merge=lfs -text +public/11.jpg filter=lfs diff=lfs merge=lfs -text +public/12.jpg filter=lfs diff=lfs merge=lfs -text +public/13.jpg filter=lfs diff=lfs merge=lfs -text +public/2.jpg filter=lfs diff=lfs merge=lfs -text +public/3.jpg filter=lfs diff=lfs merge=lfs -text +public/4.jpg filter=lfs diff=lfs merge=lfs -text +public/5.jpg filter=lfs diff=lfs merge=lfs -text +public/6.jpg filter=lfs diff=lfs merge=lfs -text +public/7.jpg filter=lfs diff=lfs merge=lfs -text +public/8.jpg filter=lfs diff=lfs merge=lfs -text +public/9.jpg filter=lfs diff=lfs merge=lfs -text +public/موکاپ-1.jpg filter=lfs diff=lfs merge=lfs -text +public/news/*.jpg filter=lfs diff=lfs merge=lfs -text +public/logo.png filter=lfs diff=lfs merge=lfs -text +panel/data.db-wal filter=lfs diff=lfs merge=lfs -text +panel/node_modules/better-sqlite3/build/Release/better_sqlite3.node filter=lfs diff=lfs merge=lfs -text