[drupal6-og: 2/2] fix conflict

[Anderson de Farias Silva]

commit a6db43d39b4e0214801eda8735414c258e6f2e9f
Merge: a143ae9 2bc336e
Author: Anderson Silva <ansilva at redhat.com>
Date:   Fri Aug 3 16:38:29 2012 -0400

    fix conflict

 drupal6-og.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc drupal6-og.spec
index acc1c7c,fd857d9..e5a9c75
--- a/drupal6-og.spec
+++ b/drupal6-og.spec
@@@ -50,9 -50,9 +50,12 @@@ rm -rf %{buildroot
  %{drupal_modules}/%{modname}
  
  %changelog
 +* Fri Aug 3 2012 Anderson Silva <ansilva at redhat.com> - 2.4-1
 +- Security update from upstream
 +
+ * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Thu May 3 2012 Anderson Silva <ansilva at redhat.com> - 2.3-1
  - Security update from upstream