Merge branch 'development'

# Conflicts: # build/mac/bin/mtp-cli
ganeshrvel · Nov 15, 2019 · 8195d53 · 8195d53
2 parents afd41db + bba3ae6
commit 8195d53
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,6 +1 @@
-* text eol=lf
-*.png binary
-*.jpg binary
-*.jpeg binary
-*.ico binary
-*.icns binary
+* text=auto
diff --git a/build/mac/bin/mtp-cli b/build/mac/bin/mtp-cli