From 18382f97eb8beec51f508ad7c3fdd86eae4a1b80 Mon Sep 17 00:00:00 2001 From: Sam Ricotta Date: Mon, 17 Oct 2022 17:04:40 +0300 Subject: [PATCH] update --- abci/example/orderbook/app.go | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/abci/example/orderbook/app.go b/abci/example/orderbook/app.go index 7229ecee4..711ccfc66 100644 --- a/abci/example/orderbook/app.go +++ b/abci/example/orderbook/app.go @@ -39,24 +39,6 @@ func (sm *StateMachine) Info(req types.RequestInfo) types.ResponseInfo { return types.ResponseInfo{} } -<<<<<<< HEAD -||||||| parent of b74494053 (process proposal checks) -func (sm *StateMachine) DeliverTx(req types.RequestDeliverTx) types.ResponseDeliverTx { - - // execute the trade i.e. update everyone's accounts - - return types.ResponseDeliverTx{Code: 0} -} - -======= -func (sm *StateMachine) DeliverTx(req types.RequestDeliverTx) types.ResponseDeliverTx { - - // execute the trade i.e. update everyone's accounts - - return types.ResponseDeliverTx{Code: 0} -} - ->>>>>>> b74494053 (process proposal checks) // CheckTx to be stateless func (sm *StateMachine) CheckTx(req types.RequestCheckTx) types.ResponseCheckTx { var msg = new(Msg)