r.horizon: change JSON format (OSGeo#3888)

a0x8o · Jul 23, 2024 · b3f26fa · b3f26fa
1 parent a6fb488
commit b3f26fa
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/raster/r.horizon/main.c b/raster/r.horizon/main.c
@@ -3684,6 +3684,7 @@ void calculate_shadow(void)
         }
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -3772,18 +3773,23 @@ void calculate_shadow(void)
 =======
 =======
 >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> cb0e431f06 (r.horizon: change JSON format (#3888))
         if (format == JSON) {
             value = json_value_init_object();
             object = json_object(value);
         }
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> cb0e431f06 (r.horizon: change JSON format (#3888))
 =======
 =======
 
 <<<<<<< HEAD
 >>>>>>> dad8f82179 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> cb0e431f06 (r.horizon: change JSON format (#3888))
         if (settings->compassOutput) {
             double tmpangle;