Initial commit after merging mu-barn and cu-barn5

2025-06-27 14:25:14 -06:00
commit ddfdb5b73a
782 changed files with 45 additions and 0 deletions
@@ -0,0 +1,14 @@
+
+############################################################
+# DO NOT EDIT THIS FILE - the content may be overwritten
+# Version: 1.0.0.0
+############################################################
+
+
+
+# not try to merge files when they have conflicts, but rather use our side of the merge over others.
+* merge=ours
+
+# tread these files as binaries
+*.meta -text -diff
+*.object -text -diff