commit 758789302299bacc342189a27ed8606eb33858bc Merge: 8897747 7d1b47a Author: Tom Callaway <spot(a)fedoraproject.org&gt; Date: Sun Oct 29 10:38:09 2017 -0400 fix merge .gitignore | 1 + chromium.spec | 22 ++++++++++++++++++++-- sources | 2 +- 3 files changed, 22 insertions(+), 3 deletions(-) ---