misc: resolve conflict

himkt · Feb 12, 2024 · 1afba93 · 1afba93
2 parents 3711cc7 + 36d6d47
commit 1afba93
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 603 deletions.
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ NOCOLOR    := $(shell tput sgr0)
 .PHONY: \
 	all docs brew \
 	cui cli gui \
-	autohotkey_clean cargo git \
+	cargo git \
 	nvim poetry tmux zsh
 
 all: clean cui docs
@@ -28,9 +28,6 @@ brew_gui:
 
 cui: cargo git nvim poetry tmux zsh
 
-autohotkey: autohotkey_clean
-	$(PWD)/autohotkey/bin/setup.sh
-
 cargo: cargo_clean
 	$(PWD)/cargo/bin/setup.sh
 
@@ -59,9 +56,6 @@ clean: \
 	git_clean nvim_clean poetry_clean \
 	tmux_clean zsh_clean
 
-autohotkey_clean:
-	$(PWD)/autohotkey/bin/clean.sh
-
 cargo_clean:
 	rm -rf $(HOME)/.cargo/config.toml
 

diff --git a/autohotkey/bin/clean.sh b/autohotkey/bin/clean.sh
diff --git a/autohotkey/bin/setup.sh b/autohotkey/bin/setup.sh
diff --git a/autohotkey/config.d/emacs.ahk b/autohotkey/config.d/emacs.ahk
diff --git a/autohotkey/config.d/minimum.ahk b/autohotkey/config.d/minimum.ahk