[chromium-libs-media-freeworld: 43/259] fix merge
commit 7d1b47a15fda080ce7cf8381605e2b75f3211c4b
Merge: 2abf30d 4b560f7
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Sun Oct 29 10:29:25 2017 -0400
fix merge
.gitignore | 1 +
chromium.spec | 22 ++++++++++++++++++++--
sources | 2 +-
3 files changed, 22 insertions(+), 3 deletions(-)
---