From 28fdde03c1ceaa974ae24a9129f6386f7fd20edf Mon Sep 17 00:00:00 2001
From: ekenny <>
Date: Thu, 23 Oct 2008 12:15:48 +0000
Subject: [PATCH] Fixed the merging problems from updates to other branches
 (presumably)

---
 org.gridsite.core/src/make-gridsite-spec | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/org.gridsite.core/src/make-gridsite-spec b/org.gridsite.core/src/make-gridsite-spec
index 05555c9..c98077b 100755
--- a/org.gridsite.core/src/make-gridsite-spec
+++ b/org.gridsite.core/src/make-gridsite-spec
@@ -191,14 +191,9 @@ fi
 %files devel
 %attr(-, root, root) %{prefix}/include/gridsite.h
 %attr(-, root, root) %{prefix}/include/gridsite-gacl.h
-<<<<<<< make-gridsite-spec
-%attr(-, root, root) %{prefix}/%{_lib}/libgridsite.a
-%attr(-, root, root) %{prefix}/%{_lib}/libgridsite_globus.a
-=======
 %attr(-, root, root) %{prefix}/%{_lib}/libgridsite.a
 %attr(-, root, root) %{prefix}/%{_lib}/libgridsite_globus.a
 %attr(-, root, root) %{prefix}/%{_lib}/libgridsite_nossl.a
->>>>>>> 1.17
 
 %files apache
 %attr(-, root, root) %{prefix}/share/man/man8/mod_gridsite.8.gz
-- 
1.8.2.3