(build) fix conflict

pgRouting · Mar 26, 2024 · 2454db0 · 2454db0
1 parent c104963
commit 2454db0
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -50,7 +50,6 @@ option(PGR_WORKSHOP_VERBOSE_DEBUG
 # CONFIGURATION
 #---------------------------------------------
 set(PGR_WORKSHOP_CITY "Prizren")
-<<<<<<< HEAD
 set(PGR_WORKSHOP_CITY_FILE "Prizren_XK")
 
 # https://github.com/OSGeo/OSGeoLive/blob/master/bin/install_osm.sh