Skip to content
GitLab
Commit 648732fc authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (13271a): Fix a badly solved merge conflict 



Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 26b9d6c0
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment