From 6e004b8eff96ae2e190677ffb80f09cd2cfcd87c Mon Sep 17 00:00:00 2001
From: Emanuel Casco <cascoemanuel@gmail.com>
Date: Thu, 7 May 2026 09:27:49 +0200
Subject: [PATCH] fix: resolve Makefile install conflict

---
 Makefile | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Makefile b/Makefile
index 1a91db3..76681db 100644
--- a/Makefile
+++ b/Makefile
@@ -18,14 +18,8 @@ clean:
 	rm -rf bin
 
 install: build
-<<<<<<< Updated upstream
-	install -m 0755 bin/ocgo $(HOME)/go/bin/ocgo
-||||||| Stash base
-	install -m 0755 bin/ocgo $$(go env GOBIN)/ocgo
-=======
 	mkdir -p "$(INSTALL_DIR)"
 	install -m 0755 bin/ocgo "$(INSTALL_DIR)/ocgo"
->>>>>>> Stashed changes
 
 release:
 	@[ -n "$(TAG)" ] || (echo "Usage: make release TAG=v0.1.0" && exit 1)