Avoid merging of Simulink Models

Thanks @traversaro
robotology · Aug 23, 2017 · 3f8895a · 3f8895a
1 parent f41addb
commit 3f8895a
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,5 @@
+*.slx -crlf -diff -merge
+*.mdl -crlf -diff -merge
+*.mat -crlf -diff -merge
+*.mlx -crlf -diff -merge
+