[drupal6] <headdesk>

[Jon Ciesla]

commit 98c2c18ccde5b829703fd70cf6507259147a542c
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Jul 17 06:56:49 2014 -0500

    <headdesk>

 drupal6.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/drupal6.spec b/drupal6.spec
index d468130..86f2847 100644
--- a/drupal6.spec
+++ b/drupal6.spec
@@ -81,7 +81,6 @@ rm -rf %{buildroot}
 %dir %attr(775,root,apache) %{_localstatedir}/lib/%{name}/files/default/
 
 %changelog
-<<<<<<< HEAD
 * Thu Jul 17 2014 Jon Ciesla <limburgher at gmail.com> - 6.32-1
 - 6.32, SA-CORE-2014-003