fix: conflict issue

graphprotocol · Dec 7, 2023 · baa8e8e · baa8e8e
1 parent 5c59ef0
commit baa8e8e
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/subgraph.template.yaml b/subgraph.template.yaml
@@ -3,10 +3,6 @@ description: Graph Network analytics subgraph
 repository: https://github.com/graphprotocol/graph-network-analytics-subgraph
 features:
   - fullTextSearch
-<<<<<<< HEAD
-  - ipfsOnEthereumContracts
-=======
->>>>>>> feat: FDS refactor
 schema:
   file: ./schema.graphql
 dataSources: