Fix makefile

pokt-network · Oct 17, 2023 · 26a346c · 26a346c
1 parent f14b5e7
commit 26a346c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -1,12 +1,8 @@
 .SILENT:
 
 POCKETD_HOME := ./localnet/pocketd
-<<<<<<< HEAD
 POCKET_NODE = tcp://127.0.0.1:36657 # The pocket rollup node (full node and sequencer in the localnet context)
 POCKET_ADDR_PREFIX = pokt
-=======
-POCKET_NODE := tcp://127.0.0.1:36657 # The pocket rollup node (full node and sequencer in the localnet context)
->>>>>>> main
 
 ########################
 ### Makefile Helpers ###