[coreutils: 2/2] resolve conflict

[Ondrej Vasik]

commit 04f29fa71bc0ae37416be433c7614692137307c3
Merge: 586a317 3c275d9
Author: Ondřej Vašík <ovasik at redhat.com>
Date:   Thu Jan 5 15:35:32 2012 +0100

    resolve conflict

 coreutils.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc coreutils.spec
index 5a93cd0,f04fd9a..a9451ec
--- a/coreutils.spec
+++ b/coreutils.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: A set of basic GNU tools commonly used in shell scripts
  Name:    coreutils
  Version: 8.14
--Release: 4%{?dist}
++Release: 5%{?dist}
  License: GPLv3+
  Group:   System Environment/Base
  Url:     http://www.gnu.org/software/coreutils/
@@@ -322,9 -322,9 +322,12 @@@ f
  %{?!norunuser:/sbin/runuser}
  
  %changelog
- * Thu Jan 05 2011 Ondrej Vasik <ovasik at redhat.com> - 8.14-4
++* Thu Jan 05 2011 Ondrej Vasik <ovasik at redhat.com> - 8.14-5
 +- fix pr -c and pr -v segfault with multibyte locales
 +
+ * Mon Oct 31 2011 Rex Dieter <rdieter at fedoraproject.org> 8.14-4
+ - rebuild (gmp), last time, I promise
+ 
  * Mon Oct 24 2011 Ondrej Vasik <ovasik at redhat.com> - 8.14-3
  - require at least pam 1.1.3-7 (#748215)