From d0d432aa8d85ec0aff25775bb76091663ab005b8 Mon Sep 17 00:00:00 2001
From: Spencer Mathews <spencer.mathews@gmail.com>
Date: Tue, 28 Mar 2017 14:32:40 -0700
Subject: [PATCH 1/2] Change macOS to UNIX line endings

---
 Global/macOS.gitignore | 52 +++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/Global/macOS.gitignore b/Global/macOS.gitignore
index f0f3fbc0..828a509a 100644
--- a/Global/macOS.gitignore
+++ b/Global/macOS.gitignore
@@ -1,26 +1,26 @@
-*.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk

From c02a4743f9c66a1d70d9ffb0da3e2156f5cc797e Mon Sep 17 00:00:00 2001
From: Spencer Mathews <spencer.mathews@gmail.com>
Date: Tue, 28 Mar 2017 14:42:51 -0700
Subject: [PATCH 2/2] Add two CR characters to ignore Icon?

---
 Global/macOS.gitignore | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Global/macOS.gitignore b/Global/macOS.gitignore
index 828a509a..5972fe50 100644
--- a/Global/macOS.gitignore
+++ b/Global/macOS.gitignore
@@ -3,8 +3,7 @@
 .LSOverride
 
 # Icon must end with two \r
-Icon
-
+Icon

 
 # Thumbnails
 ._*