[opensips: 5/5] fixed merge conflict

[John A. Khvatov]

commit db67689fb899d247191c3ec1f9a0c07967887c3e
Merge: ec28d5b ffe3f71
Author: John Khvatov <ivaxer at sgu.ru>
Date:   Mon Nov 7 02:45:42 2011 +0400

    fixed merge conflict

 opensips.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc opensips.spec
index fe61e7c,f9e5712..b684c4b
--- a/opensips.spec
+++ b/opensips.spec
@@@ -1030,22 -1011,10 +1030,25 @@@ f
  %{_libdir}/opensips/modules/xmpp.so
  %doc docdir/README.xmpp
  
 +%files python
 +%defattr(-,root,root,-)
 +%{_libdir}/opensips/modules/python.so
 +
 +%files event_datagram
 +%defattr(-,root,root,-)
 +%{_libdir}/opensips/modules/event_datagram.so
 +%doc docdir/README.event_datagram
 +
  %changelog
 +* Mon Nov 07 2011 John Khvatov <ivaxer at fedoraproject.org> - 1.7.0-1
 +- update to 1.7.0
 +- dropped upstreamed patches
 +- added new modules: event_datagram and python
 +- removed lcr module
 +
+ * Sat Sep 17 2011  Remi Collet <remi at fedoraproject.org> - 1.6.4-13
+ - rebuild against libmemcached.so.8
+ 
  * Mon Aug 22 2011 John Khvatov <ivaxer at fedoraproject.org> - 1.6.4-12
  - rebuild against new libnetsnmp