Auto stash before rebase of "refs/heads/main"

2022-11-04 10:44:37 -07:00
parent acd929b524
commit 9d57295d98
22 changed files with 27 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,2 +1,8 @@
 # Auto detect text files and perform LF normalization
 * text=auto
+<<<<<<< Updated upstream
+=======
+*.c16 filter=lfs diff=lfs merge=lfs -text
+*.RAW filter=lfs diff=lfs merge=lfs -text
+*.C16 filter=lfs diff=lfs merge=lfs -text
+>>>>>>> Stashed changes