iamsuman commited on
Commit
a4973de
·
1 Parent(s): d217564

fix: merge conflicts

Browse files
Files changed (1) hide show
  1. .gitattributes +4 -0
.gitattributes CHANGED
@@ -33,4 +33,8 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
33
  *.zip filter=lfs diff=lfs merge=lfs -text
34
  *.zst filter=lfs diff=lfs merge=lfs -text
35
  *tfevents* filter=lfs diff=lfs merge=lfs -text
 
36
  public/fire.gif filter=lfs diff=lfs merge=lfs -text
 
 
 
 
33
  *.zip filter=lfs diff=lfs merge=lfs -text
34
  *.zst filter=lfs diff=lfs merge=lfs -text
35
  *tfevents* filter=lfs diff=lfs merge=lfs -text
36
+ <<<<<<< HEAD
37
  public/fire.gif filter=lfs diff=lfs merge=lfs -text
38
+ =======
39
+ *.gif filter=lfs diff=lfs merge=lfs -text
40
+ >>>>>>> b46af75 (added gif file to lfs)