updare

hope.json

@@ -924,11 +924,7 @@
       "id": "006",
       "display-name": "Collars",
       "datatype": "BoreHole",
-<<<<<<< HEAD
-      "source": "C:/Users/runes/Documents/GitHub/ViRGiS_geo/test_data/boreholes/Hope_collars_E9.vrt",
-=======
       "source": "test_data/boreholes/Hope_collars_E9.vrt",
->>>>>>> 052ec496d5282d2da7435c1620e682926dd7d206
       "position": null,
       "transform": {
         "translate": [
@@ -1358,11 +1354,7 @@
         "bbox": null,
         "mapscale": 0,
         "map_size": 0,
-<<<<<<< HEAD
-        "image_folder": "test_data\\images",
-=======
         "image_folder": "test_data/images",
->>>>>>> 052ec496d5282d2da7435c1620e682926dd7d206
         "bh-data": {
           "x-field": null,
           "y-field": null,