Skip to content
Snippets Groups Projects
Commit e693dd13 authored by Jakob Olsson's avatar Jakob Olsson
Browse files

fix commited merge conflict

parent b0ca6abb
No related branches found
No related tags found
No related merge requests found
...@@ -12,11 +12,7 @@ enum schema_call_t { ...@@ -12,11 +12,7 @@ enum schema_call_t {
int schema_validator_destroy(void); int schema_validator_destroy(void);
int schema_validator_init(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);
=======
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_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); bool json_object_validate_schema(struct json_object *j_obj, struct json_object *j_schema);
#ifdef __cplusplus #ifdef __cplusplus
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment