From 403666ebd86bbdd850baac370927b8c3471cae03 Mon Sep 17 00:00:00 2001
From: Juan Manuel Rodriguez Defago <juanma.rdefago@gmail.com>
Date: Fri, 1 Sep 2023 18:21:16 -0300
Subject: [PATCH] fix: conflict issue

---
 subgraph.template.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/subgraph.template.yaml b/subgraph.template.yaml
index df56df2..05286e9 100644
--- 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: