kenken999 commited on
Commit
3ea4537
1 Parent(s): c4bf238
Files changed (1) hide show
  1. .gitattributes +1 -4
.gitattributes CHANGED
@@ -41,10 +41,7 @@ static/chara_blinking.png filter=lfs diff=lfs merge=lfs -text
41
  *.png filter=lfs diff=lfs merge=lfs -text
42
  *.com filter=lfs diff=lfs merge=lfs -text
43
  *.com3 filter=lfs diff=lfs merge=lfs -text
44
- <<<<<<< HEAD
45
  *.psd filter=lfs diff=lfs merge=lfs -text
46
  *.cmo3 filter=lfs diff=lfs merge=lfs -text
47
  *.cmo filter=lfs diff=lfs merge=lfs -text
48
- =======
49
- *.psd filter=lfs diff=lfs merge=lfs -text
50
- >>>>>>> 70216d5804559418074b91a6fd06dbda9e8897f7
 
41
  *.png filter=lfs diff=lfs merge=lfs -text
42
  *.com filter=lfs diff=lfs merge=lfs -text
43
  *.com3 filter=lfs diff=lfs merge=lfs -text
 
44
  *.psd filter=lfs diff=lfs merge=lfs -text
45
  *.cmo3 filter=lfs diff=lfs merge=lfs -text
46
  *.cmo filter=lfs diff=lfs merge=lfs -text
47
+ *.wav filter=lfs diff=lfs merge=lfs -text