diff options
| author | IBNobody <ibnobody@gmail.com> | 2016-05-02 23:15:56 -0500 |
|---|---|---|
| committer | IBNobody <ibnobody@gmail.com> | 2016-05-02 23:15:56 -0500 |
| commit | 35d7081899df3a486b9b5785c7e8ec9481195848 (patch) | |
| tree | 682a322ce2c3e2004abb4fbd00fc00316277b935 /.gitignore | |
| parent | 499e3096e9021b88a6a705ad7034ccbacb97b975 (diff) | |
| parent | 2c070163ffffffde546fb00acaa2fbb96b93da64 (diff) | |
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 8b8c45169d..a082ea22e4 100644 --- a/.gitignore +++ b/.gitignore @@ -16,8 +16,8 @@ build/ .vagrant/ .DS_STORE -# Eclipse Settings +# Eclipse/PyCharm/Other IDE Settings .cproject .project .settings/ - +.idea |