From 0ee37b0a660a6aa55745865f01bacb22db1debb9 Mon Sep 17 00:00:00 2001
From: Michael Housh <mhoush@houshhomeenergy.com>
Date: Mon, 27 Dec 2021 18:32:56 -0500
Subject: [PATCH] Fixed merge conflicts

---
 macOS/.config/macOS/Brewfile  | 3 ++-
 scripts/.local/scripts/isosec | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/macOS/.config/macOS/Brewfile b/macOS/.config/macOS/Brewfile
index c73bf5c..5fe7e69 100644
--- a/macOS/.config/macOS/Brewfile
+++ b/macOS/.config/macOS/Brewfile
@@ -7,9 +7,10 @@ tap "federico-terzi/espanso"
 cask_args appdir: "~/Applications", require_sha: true
 
 # formula
-brew "espanso"
+brew "espanso"          # Espanso: Text expander
 brew "fd"               # required for some neovim plugins
 brew "figlet"
+brew "gh"               # Github CLI
 brew "git"
 brew "mas"
 brew "neovim"
diff --git a/scripts/.local/scripts/isosec b/scripts/.local/scripts/isosec
index 3cde918..1c38423 100755
--- a/scripts/.local/scripts/isosec
+++ b/scripts/.local/scripts/isosec
@@ -1,3 +1,9 @@
 #!/bin/sh
 
-echo "$(date -u '+%Y%m%d%H%M%S')"
+set -e
+
+isosec() {
+  echo "$(date -u '+%Y%m%d%H%M%S')"
+}
+
+isosec