diff --git a/src/json-validator.h b/src/json-validator.h index 6b3b3f233fab3d9c9e05ddef8f5bafc59325fda3..e5e27b30b2b29c53884193b70cd48fb46407942e 100644 --- a/src/json-validator.h +++ b/src/json-validator.h @@ -12,7 +12,11 @@ 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