feat: rebase

vegaprotocol · Nov 6, 2023 · 56f70fd · 56f70fd
1 parent 839d024
commit 56f70fd
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,12 +12,9 @@
 
 ### 🛠 Improvements
 
-<<<<<<< HEAD
 - [9930](https://github.com/vegaprotocol/vega/issues/9930) - `LiquidityFeeSettings` can now be used in market proposals to choose how liquidity fees are calculated.
 - [9982](https://github.com/vegaprotocol/vega/issues/9982) - Remove fees and minimal transfer amount from vested account
-=======
 - [9955](https://github.com/vegaprotocol/vega/issues/9955) - Add data node subscription for transaction results.
->>>>>>> 972fc8295 (feat: fix and changelog)
 
 ### 🐛 Fixes
 

diff --git a/datanode/api/trading_data_v2.go b/datanode/api/trading_data_v2.go
@@ -29,16 +29,7 @@ import (
 	"strings"
 	"time"
 
-<<<<<<< HEAD
-=======
-	"github.com/georgysavva/scany/pgxscan"
-
-	"code.vegaprotocol.io/vega/datanode/sqlstore"
-
-	"golang.org/x/sync/errgroup"
-
 	"code.vegaprotocol.io/vega/core/events"
->>>>>>> f7ef6a543 (feat: add transaction result subscription)
 	"code.vegaprotocol.io/vega/core/risk"
 	"code.vegaprotocol.io/vega/core/types"
 	"code.vegaprotocol.io/vega/datanode/candlesv2"