resolve conflicts

OSGeo · Feb 2, 2025 · d5d38de · d5d38de
1 parent 99296b4
commit d5d38de
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/lib/ogsf/gp3.c b/lib/ogsf/gp3.c
@@ -85,8 +85,7 @@ geopoint *Gp_load_sites(const char *name, int *nsites, int *has_z)
     }
     char *mname = G_fully_qualified_name(name, mapset);
 
-        while (eof == 0)
-    {
+    while (eof == 0) {
         ltype = Vect_read_next_line(&map, Points, Cats);
         switch (ltype) {
         case -1: {