fix: merge

Signed-off-by: Carlos A Becker <caarlos0@gmail.com>
charmbracelet · Dec 8, 2021 · 10cacdc · 10cacdc
1 parent 7d83e39
commit 10cacdc
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/go.mod b/go.mod
@@ -39,9 +39,4 @@ require (
 	google.golang.org/protobuf v1.26.0-rc.1 // indirect
 )
 
-<<<<<<< HEAD
-replace github.com/charmbracelet/wish => ../wish
-
-=======
->>>>>>> 2f5f155 (feat: update stuff)
 replace github.com/charmbracelet/promwish => ../promwish