Resolve merge conflict.

One day i will fix this file.
Update rc files for mac.
2 changed files with 7 additions and 4 deletions
--- a/.config/hammerspoon/init.lua
+++ b/.config/hammerspoon/init.lua
@ -82,17 +82,17 @@ end)

 -- stolen from @mrled
 appCuts = {
-  c = 'Google Chrome',
+  c = 'Microsoft Edge',
  e = 'Emacs',
  d = 'Dash',
-  f = 'Firefox',  
+  f = 'Firefox',
  h = 'Hammerspoon',
  l = 'Slack',
  m = 'Mail.app',
  o = 'Calendar.app',
  p = 'Bitwarden',
-  t = 'Terminal.app',
-  z = 'Zoom.us'  
+  t = 'iTerm.app',
+  z = 'Zoom.us'
 }

 modalHotKey = dofile(os.getenv("HOME") .. "/.config/hammerspoon/modalHotKey.lua")
--- a/.zshrc
+++ b/.zshrc
@ -81,3 +81,6 @@ if [ -f '/Users/josiah.ledbetter/google-cloud-sdk/completion.zsh.inc' ]; then .
 if [ -e /Users/josiah.ledbetter/.nix-profile/etc/profile.d/nix.sh ]; then . /Users/josiah.ledbetter/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer

 export PATH="$HOME/.poetry/bin:$PATH"
+
+autoload -U +X bashcompinit && bashcompinit
+complete -o nospace -C /usr/local/bin/terraform terraform
Author	SHA1	Message	Date
Josiah Ledbetter	7169f34550	Resolve merge conflict.	2 years ago
Josiah Ledbetter	3f2da0833d	One day i will fix this file.	2 years ago
Josiah Ledbetter	1239b4b0bd	Update rc files for mac.	2 years ago
Josiah Ledbetter	cc2d643feb	Change apps.	2 years ago