[chromium-libs-media-freeworld: 44/259] fix merge
commit 7745b940277628f4441e38459f2b3f8a7550544a
Merge: d02ac4e 7d1b47a
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Sun Oct 29 10:38:40 2017 -0400
fix merge
.gitignore | 1 +
chromium.spec | 22 ++++++++++++++++++++--
sources | 2 +-
3 files changed, 22 insertions(+), 3 deletions(-)
---