[rwall: 4/4] resolving conflict

[Honza Horak]

commit 0b05ecc6a2b8f62616561dd03fab52e099c30d43
Merge: 925b1a4 6a3c83a
Author: Honza Horák <hhorak at redhat.com>
Date:   Tue Sep 11 10:11:41 2012 +0200

    resolving conflict

 rwall.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --cc rwall.spec
index 9a66d50,dbbe887..77956c7
--- a/rwall.spec
+++ b/rwall.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: Client for sending messages to a host's logged in users
  Name: rwall
  Version: 0.17
- Release: 34%{?dist}
 -Release: 35%{?dist}
++Release: 36%{?dist}
  License: BSD
  Url: ftp://ftp.linux.org.uk/pub/linux/Networking/netkit/
  Group: System Environment/Daemons
@@@ -130,11 -121,12 +130,17 @@@ install -m 755 %{SOURCE1} ${RPM_BUILD_R
  %{_unitdir}/*
  
  %changelog
- * Tue Sep 11 2012 Honza Horak <hhorak at redhat.com> - 0.17-34
++* Tue Sep 11 2012 Honza Horak <hhorak at redhat.com> - 0.17-36
 +- added ordering dependencies to rpcbind
 +- Minor spec file changes
 +- Use new systemd macros (Resolves: #850303)
 +
+ * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17-35
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17-34
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Mon Aug 01 2011 Honza Horak <hhorak at redhat.com> - 0.17-33
  - added systemd native unit file