Merge pull request snes9xgit#671 from orsi/ignore-osx-files

Ignore osx files and remove cached/tracked .DS_Store
tooncoon · Sep 14, 2020 · 6c1926a · 6c1926a
2 parents c69170c + 9bf174c
commit 6c1926a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -499,3 +499,7 @@ MigrationBackup/
 # vim
 *.swp
 
+# OS X temporary files
+.DS_Store
+*.lock
+profile
diff --git a/macosx/.DS_Store b/macosx/.DS_Store
-Original file line number
+Diff line change
@@ Expand Up / @@ -499,3 +499,7 @@ MigrationBackup/ @@
     # vim
     *.swp
+    # OS X temporary files
+    .DS_Store
+    *.lock
+    profile