Merge branch 'master' into develop

rbanffy · Aug 24, 2016 · 17c98b3 · 17c98b3
2 parents e805705 + 82661cf
commit 17c98b3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,6 @@
 
 # Packaging
 .cask
+
+# macOS
+.DS_Store
diff --git a/selectric-mode.el b/selectric-mode.el
@@ -47,7 +47,6 @@
       (make-sound (format "%sselectric-move.wav" selectric-files-path))
       (make-sound (format "%sselectric-move.wav" selectric-files-path))))
 
-
 ;;;###autoload
 (define-minor-mode selectric-mode
   "Toggle Selectric mode.