summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@users.noreply.github.com>2015-11-10 11:03:39 -0500
committerPliable Pixels <pliablepixels@users.noreply.github.com>2015-11-10 11:03:39 -0500
commit9c410b01baadc49cd0e9efce5e78f5499dc02240 (patch)
tree49c6387aa23b33736e3b2e7798f6eb4e83f53530
parent55fa88e22c567d86afb7ddcd083849b28e934e92 (diff)
parent48db6198895a68ca153e275494958573b96f3dc8 (diff)
Merge pull request #79 from jsloyer/update-gitignore
prevents checkin of unnecessary file from osx Former-commit-id: fcb91fe5ad81ff1a8cd1c5934335d3eea736dbdd
-rw-r--r--.DS_Storebin12292 -> 0 bytes
-rw-r--r--.gitignore1
-rw-r--r--resources/.DS_Storebin10244 -> 0 bytes
-rw-r--r--resources/android/.DS_Storebin6148 -> 0 bytes
-rw-r--r--resources/ios/.DS_Storebin6148 -> 0 bytes
-rw-r--r--resources/ios/icon/.DS_Storebin6148 -> 0 bytes
-rw-r--r--resources/psd/.DS_Storebin6148 -> 0 bytes
-rw-r--r--www/.DS_Storebin6148 -> 0 bytes
-rw-r--r--www/external/android-notification-icons/.DS_Storebin8196 -> 0 bytes
-rw-r--r--www/img/.DS_Storebin6148 -> 0 bytes
-rw-r--r--www/lib/.DS_Storebin6148 -> 0 bytes
-rw-r--r--www/sounds/.DS_Storebin6148 -> 0 bytes
12 files changed, 1 insertions, 0 deletions
diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index da51c599..00000000
--- a/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/.gitignore b/.gitignore
index 2e724c10..15e827dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ plugins/*
!plugins/fetch.json
engine/
/ionic.project
+.DS_Store
diff --git a/resources/.DS_Store b/resources/.DS_Store
deleted file mode 100644
index 2d429286..00000000
--- a/resources/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/resources/android/.DS_Store b/resources/android/.DS_Store
deleted file mode 100644
index 7e8d5db6..00000000
--- a/resources/android/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/resources/ios/.DS_Store b/resources/ios/.DS_Store
deleted file mode 100644
index f31696d2..00000000
--- a/resources/ios/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/resources/ios/icon/.DS_Store b/resources/ios/icon/.DS_Store
deleted file mode 100644
index 6f4f0587..00000000
--- a/resources/ios/icon/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/resources/psd/.DS_Store b/resources/psd/.DS_Store
deleted file mode 100644
index 8796b839..00000000
--- a/resources/psd/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/www/.DS_Store b/www/.DS_Store
deleted file mode 100644
index 160b5625..00000000
--- a/www/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/www/external/android-notification-icons/.DS_Store b/www/external/android-notification-icons/.DS_Store
deleted file mode 100644
index a6cabb45..00000000
--- a/www/external/android-notification-icons/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/www/img/.DS_Store b/www/img/.DS_Store
deleted file mode 100644
index c247ecec..00000000
--- a/www/img/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/www/lib/.DS_Store b/www/lib/.DS_Store
deleted file mode 100644
index 39550787..00000000
--- a/www/lib/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/www/sounds/.DS_Store b/www/sounds/.DS_Store
deleted file mode 100644
index a6356cd9..00000000
--- a/www/sounds/.DS_Store
+++ /dev/null
Binary files differ