[igt-dev] ✗ Fi.CI.BUILD: failure for Use Jansson instead of json-c in igt_runner

[Patchwork]

== Series Details ==

Series: Use Jansson instead of json-c in igt_runner
URL   : https://patchwork.freedesktop.org/series/107123/
State : failure

== Summary ==

Applying: runner: Use Jansson in resultgen instead of json-c
Using index info to reconstruct a base tree...
M	runner/resultgen.c
Falling back to patching base and 3-way merge...
Auto-merging runner/resultgen.c
CONFLICT (content): Merge conflict in runner/resultgen.c
Patch failed at 0001 runner: Use Jansson in resultgen instead of json-c
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".