From 9f5e1af0fb575d9be22140f1a7377310647f3699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pedro=20L=2E=20Magalh=C3=A3es?=
 <pedro.magalhaes@uni-bremen.de>
Date: Sun, 10 Dec 2023 22:39:11 +0100
Subject: [PATCH] Pre-merge 2.

---
 tests/test_gis_identify.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/test_gis_identify.py b/tests/test_gis_identify.py
index 1d62f7c..93c5866 100644
--- a/tests/test_gis_identify.py
+++ b/tests/test_gis_identify.py
@@ -4542,10 +4542,6 @@ class TestGisIdentify:
     # *************************************************************************
     # *************************************************************************
     
-<<<<<<< HEAD
-#******************************************************************************
-#******************************************************************************
-=======
     def test_finding_roundabouts(self):
         
         # network should be a OSM-nx formatted graph
-- 
GitLab