format

Author: Vladimir Ershov

contrib/pgpro_scheduler/src/scheduler_manager.c

@@ -959,22 +959,14 @@ void init_executor_shared_data(schd_executor_share_t *data, scheduler_manager_ct
 		strcpy(data->database, ctx->database);
 	else
 		elog(ERROR, "String \"%s\"\n"
-<<<<<<< HEAD
-				    "has %zu symbols, while it should have less than %d symbols.",
-=======
-					"has %d symbols, while it should have less than %d symbols.",
->>>>>>> PGPROEE10
+					"has %lu symbols, while it should have less than %d symbols.",
 					ctx->database, strlen(ctx->database), PGPRO_SCHEDULER_DBNAME_MAX);
 
 	if(strlen(job->node) < PGPRO_SCHEDULER_NODENAME_MAX)
 		strcpy(data->nodename, job->node);
 	else
 		elog(ERROR, "String \"%s\"\n"
-<<<<<<< HEAD
-				    "has %zu symbols, while it should have less than %d symbols.",
-=======
-					"has %d symbols, while it should have less than %d symbols.",
->>>>>>> PGPROEE10
+					"has %lu symbols, while it should have less than %d symbols.",
 					job->node, strlen(job->node), PGPRO_SCHEDULER_NODENAME_MAX);
 
 	data->new_job = true;
@@ -1804,30 +1796,18 @@ int start_at_worker(scheduler_manager_ctx_t *ctx, int pos)
 	item->res_owner = CurrentResourceOwner;
 	shm_data = dsm_segment_address(item->shared);
 
-<<<<<<< HEAD
-=======
-
->>>>>>> PGPROEE10
 	if(strlen(ctx->database) < PGPRO_SCHEDULER_DBNAME_MAX)
 		strcpy(shm_data->database, ctx->database);
 	else
 		elog(ERROR, "String \"%s\"\n"
-<<<<<<< HEAD
-				    "has %zu symbols, while it should have less than %d symbols.",
-=======
-					"has %d symbols, while it should have less than %d symbols.",
->>>>>>> PGPROEE10
+					"has %lu symbols, while it should have less than %d symbols.",
 					ctx->database, strlen(ctx->database), PGPRO_SCHEDULER_DBNAME_MAX);
 
 	if(strlen(ctx->nodename) < PGPRO_SCHEDULER_NODENAME_MAX)
 		strcpy(shm_data->nodename, ctx->nodename);
 	else
 		elog(ERROR, "String \"%s\"\n"
-<<<<<<< HEAD
-				    "has %zu symbols, while it should have less than %d symbols.",
-=======
-					"has %d symbols, while it should have less than %d symbols.",
->>>>>>> PGPROEE10
+					"has %lu symbols, while it should have less than %d symbols.",
 					ctx->nodename, strlen(ctx->nodename), PGPRO_SCHEDULER_NODENAME_MAX);
 
 	shm_data->stop_worker  = false;