Commit ebee4b58 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] v4l2-ctrls: Fix a merge conflict 



Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 064f5096
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment