From e693dd1322bc7f78611af253f9d63ae527b50eb1 Mon Sep 17 00:00:00 2001 From: Jakob Olsson <Jakob Olsson> Date: Mon, 2 Dec 2019 15:05:57 +0100 Subject: [PATCH] fix commited merge conflict --- src/json-validator.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/json-validator.h b/src/json-validator.h index e5e27b3..6b3b3f2 100644 --- a/src/json-validator.h +++ b/src/json-validator.h @@ -12,11 +12,7 @@ enum schema_call_t { int schema_validator_destroy(void); int schema_validator_init(void); -<<<<<<< HEAD bool schema_validator_validate(struct json_object *j_object, char *object, char *method, enum schema_call_t type); -======= -bool schema_validator_validate(struct json_object j_object, char *object, char *method, enum schema_call_t type); ->>>>>>> 62fc741... json-validator: add validate function bool json_object_validate_schema_inject_definitions(struct json_object *j_object, struct json_object *definitions, struct json_object *j_schema); bool json_object_validate_schema(struct json_object *j_obj, struct json_object *j_schema); #ifdef __cplusplus -- GitLab