Fixed merge conflicts

This commit is contained in:
2021-12-27 18:32:56 -05:00
parent c33cb65caf
commit 0ee37b0a66
2 changed files with 9 additions and 2 deletions

View File

@@ -7,9 +7,10 @@ tap "federico-terzi/espanso"
cask_args appdir: "~/Applications", require_sha: true cask_args appdir: "~/Applications", require_sha: true
# formula # formula
brew "espanso" brew "espanso" # Espanso: Text expander
brew "fd" # required for some neovim plugins brew "fd" # required for some neovim plugins
brew "figlet" brew "figlet"
brew "gh" # Github CLI
brew "git" brew "git"
brew "mas" brew "mas"
brew "neovim" brew "neovim"

View File

@@ -1,3 +1,9 @@
#!/bin/sh #!/bin/sh
echo "$(date -u '+%Y%m%d%H%M%S')" set -e
isosec() {
echo "$(date -u '+%Y%m%d%H%M%S')"
}
isosec