[gnatcoll/f17: 2/2] Fix merge conflicts

[Pavel Zhukov]

commit c55e9874acd7e9ad182645aac4117722135858d3
Merge: 017a8bf a1182c6
Author: Pavel Zhukov <pavel at zhukoff.net>
Date:   Tue Jul 24 21:52:47 2012 +0400

    Fix merge conflicts

 gnatcoll.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc gnatcoll.spec
index 611177e,59062a6..4db08c2
--- a/gnatcoll.spec
+++ b/gnatcoll.spec
@@@ -94,10 -94,9 +94,13 @@@ rm -f %{buildroot}/%{_datadir}/%{name}/
  
  
  %changelog
 +* Tue Jul 24 2012 Pavel Zhukov <landgraf at fedoraproject.org> - 2012-5
 +- Delete rpath from libraries
 +- Add lgpr files to project
 +
+ * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2012-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Tue Jul 17 2012 Pavel Zhukov <landgraf at fedoraproject.org> - 2012-3
  - Update to 2012
  - Fix library type in gpr