Skip to content
Commit 61154220 authored by Gregor Jasny's avatar Gregor Jasny
Browse files

Declare conflict with media-ctl 



Signed-off-by: default avatarGregor Jasny <gjasny@googlemail.com>
parent 6e367062
Hide whitespace changes
Inline Side-by-side
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