# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1598822865 14400
# Node ID 7c341a980eda20dfb42d681b4294be1ffda1b41a
# Parent  bb1f0bc31860df0178acf91f1002eacc1581e986# Parent  9097174b115d0e1898613456d02d350b7c665efc
Merge

diff -r bb1f0bc31860 -r 7c341a980eda ffignore
--- a/ffignore	Thu Aug 27 22:46:44 2020 -0400
+++ b/ffignore	Sun Aug 30 17:27:45 2020 -0400
@@ -7,6 +7,7 @@
 node_modules
 fake-gopath
 slug
+docs/build
 
 syntax:regex
 \btags$
diff -r bb1f0bc31860 -r 7c341a980eda stumpwmrc
--- a/stumpwmrc	Thu Aug 27 22:46:44 2020 -0400
+++ b/stumpwmrc	Sun Aug 30 17:27:45 2020 -0400
@@ -427,9 +427,6 @@
 (defcommand spotify () ()
   (run-or-raise "spotify" '(:class "Spotify")))
 
-(defcommand intellij () ()
-  (run-or-raise "~/intellij/bin/idea.sh" '(:class "jetbrains-idea-ce")))
-
 (defcommand browser () ()
   (run-or-raise "firefox" '(:class "Firefox")))
 
@@ -587,7 +584,7 @@
 (define-top-keys ;; timers
   ("s-F7"  "tea-timer")
   ("s-F9"  "run-pop-timer")
-  ("s-F8" "set-pop-timer")
+  ("s-F8"  "set-pop-timer")
   ("s-p"   "posture-start")
   ("s-P"   "posture-stop")
   ("s-y"   "posture-answer-yes")
diff -r bb1f0bc31860 -r 7c341a980eda vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Thu Aug 27 22:46:44 2020 -0400
+++ b/vim/custom-dictionary.utf-8.add	Sun Aug 30 17:27:45 2020 -0400
@@ -309,3 +309,4 @@
 deduplicating
 passlist
 golang
+unapplied