summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJack Humbert2016-04-26 13:48:36 -0400
committerJack Humbert2016-04-26 13:48:36 -0400
commitc37d52d2137acf5739c481cc0c8917ad6fd77161 (patch)
tree2fdaf2f195094efbd9fe0680579cf85602e5584c /.gitignore
parent0edc7a9d87ecbbce580cbbd0b0fffaad24f37f83 (diff)
parent27e3294909175dea1ae8618cace8f50d33e1dc98 (diff)
resolves conflicts in rgblight.c
# Conflicts: # quantum/rgblight.c
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 8b8c45169..a082ea22e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,8 +16,8 @@ build/
.vagrant/
.DS_STORE
-# Eclipse Settings
+# Eclipse/PyCharm/Other IDE Settings
.cproject
.project
.settings/
-
+.idea