Revert "November 2022 Update"
This reverts commit c6478ea40a9e2cb27276286bf217cc374dd4689e.
This commit is contained in:
parent
9d57295d98
commit
11f41e2fc5
3
.gitattributes
vendored
3
.gitattributes
vendored
@ -1,8 +1,11 @@
|
|||||||
# Auto detect text files and perform LF normalization
|
# Auto detect text files and perform LF normalization
|
||||||
* text=auto
|
* text=auto
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< Updated upstream
|
<<<<<<< Updated upstream
|
||||||
=======
|
=======
|
||||||
*.c16 filter=lfs diff=lfs merge=lfs -text
|
*.c16 filter=lfs diff=lfs merge=lfs -text
|
||||||
*.RAW filter=lfs diff=lfs merge=lfs -text
|
*.RAW filter=lfs diff=lfs merge=lfs -text
|
||||||
*.C16 filter=lfs diff=lfs merge=lfs -text
|
*.C16 filter=lfs diff=lfs merge=lfs -text
|
||||||
>>>>>>> Stashed changes
|
>>>>>>> Stashed changes
|
||||||
|
=======
|
||||||
|
>>>>>>> parent of c6478ea... November 2022 Update
|
||||||
|
Loading…
Reference in New Issue
Block a user