Merge pull request RocketChat#12 from knjname/patch-1

chore: Ignore and remove .DS_Store
adiscord · Jun 11, 2018 · 709ad28 · 709ad28
2 parents 1b95583 + 2020dab
commit 709ad28
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,8 @@
 /node_modules
 /yarn-error.log
 /.nyc_output
-/.DS_Store
 /.env
 /shrinkwrap.yaml
 /package-lock.json
-/docs/
+/docs/
+.DS_Store
diff --git a/src/.DS_Store b/src/.DS_Store