[coreutils: 2/2] Fix merge conflicts

[Ondrej Vasik]

commit df0e53f22d7f97318280b2fbd1ecc6bcb1f15862
Merge: 9c33d82 8246976
Author: Ondřej Vašík <ovasik at redhat.com>
Date:   Tue Jul 22 14:02:48 2014 +0200

    Fix merge conflicts

 coreutils.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --cc coreutils.spec
index f682131,442b99b..8cd0578
--- a/coreutils.spec
+++ b/coreutils.spec
@@@ -367,11 -379,9 +369,14 @@@ f
  %{_sbindir}/chroot
  
  %changelog
 +* Tue Jul 22 2014 Ondrej Vasik <ovasik at redhat.com> - 8.23-1
 +- new upstream release 8.23
 +- synchronize the old differences in ls SELinux options
 +  with upstream
 +
+ * Fri Jul 11 2014 Tom Callaway <spot at fedoraproject.org> - 8.22-17
+ - fix license handling
+ 
  * Mon Jun 23 2014 Jakub Čajka <jcajka at redhat.com> - 8.22-16
  - fix failed tests on ppc(backport from gnulib upstream)