i.segment: fix compilation issue from https://trac.osgeo.org/grass/changeset/55022

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@55024 15284696-431f-4ddb-bdfa-cd5b030d7da7

imagery/i.segment/main.c

@@ -36,11 +36,7 @@ int main(int argc, char *argv[])
     G_add_keyword(_("segmentation"));
     G_add_keyword(_("object recognition"));
     module->description =
-<<<<<<< .mine
-	_("Identify segments (objects) from imagery.");
-=======
-	_("Outputs a single segmented raster map based on input values in an image group.");
->>>>>>> .r55021
+	_("Identifies segments (objects) from imagery data.");
 
     parse_args(argc, argv, &globals);