[nodejs-hawk/el6] clean up accidentally left over merge gunk

[T.C. Hollingsworth]

commit 556fedf1818664aa675d12960c853ff3105331e3
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Tue Jul 30 12:40:25 2013 -0700

    clean up accidentally left over merge gunk

 nodejs-hawk.spec |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/nodejs-hawk.spec b/nodejs-hawk.spec
index c2d51bf..339cc45 100644
--- a/nodejs-hawk.spec
+++ b/nodejs-hawk.spec
@@ -48,12 +48,9 @@ rm -rf %{buildroot}
 %doc README.md LICENSE example images
 
 %changelog
-<<<<<<< HEAD
-=======
 * Tue Jul 30 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 1.0.0-1
 - new upstream release 1.0.0
 
->>>>>>> master
 * Sun Jun 23 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.15.0-1
 - new upstream release 0.15.0