Mr.Gay100
/
steelforesight
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix gitattributes merge conflict marker 

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
alireza 2026-06-02 15:38:41 +03:30
parent 7d7063b6e8
commit b3e8308f21
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.gitattributes vendored
View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
*.mp4 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/1.jpg filter=lfs diff=lfs merge=lfs -text
public/10.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/موکاپ-1.jpg filter=lfs diff=lfs merge=lfs -text
public/news/*.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 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