From 84d4790b3e161d2c82d4f90f653e4e257ff9ac6e 2014-05-16 16:59:07
From: Min RK <benjaminrk@gmail.com>
Date: 2014-05-16 16:59:07
Subject: [PATCH] Merge pull request #5867 from jdfreder/dsstore

Ignore .DS_Store files (OSX)
---

diff --git a/.gitignore b/.gitignore
index 3bb8bad..37530a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ __pycache__
 *.bak
 .ipynb_checkpoints
 .tox
+.DS_Store