[squid/f13/master] Resolve merge differences

[Henrik Nordström]

commit 81bb0765497398648cf4b0e7c65b5b188aec40d7
Author: Henrik Nordstrom <henrik at henriknordstrom.net>
Date:   Sat Aug 21 20:20:46 2010 +0200

    Resolve merge differences

 squid.spec |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/squid.spec b/squid.spec
index 702c839..2f6f095 100644
--- a/squid.spec
+++ b/squid.spec
@@ -32,10 +32,6 @@ Patch204: squid-3.0.STABLE1-perlpath.patch
 Patch205: squid-3.1.0.15-smb-path.patch
 Patch208: squid-3.0.STABLE7-from_manpg.patch
 
-# Temporary patches
-# 3.1.5 bundles a slightly broken libtool. Fixed upstream.
-Patch301: squid-3.1.5-libtoolinclude.patch
-
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: bash >= 2.0
 Requires(pre): shadow-utils
@@ -82,8 +78,6 @@ lookup program (dnsserver), a program for retrieving FTP data
 %patch205 -p1 -b .smb-path
 %patch208 -p1 -b .from_manpg
 
-%patch301 -p1 -b .libtoolinclude
-
 %build
 
 %configure \