[squid/f13/master: 9/12] 3.1.9

[Henrik Nordström]

commit 4021b92807bff88ed6dd16c9c1e88a60e42c96ec
Author: Henrik Nordstrom <henrik at henriknordstrom.net>
Date:   Mon Oct 25 20:21:32 2010 +0200

    3.1.9

 squid.spec |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/squid.spec b/squid.spec
index 3b544a2..1d54c2a 100644
--- a/squid.spec
+++ b/squid.spec
@@ -3,13 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-<<<<<<< HEAD
 Version:  3.1.9
-Release:  1%{?dist}
-=======
-Version:  3.1.8
 Release:  2%{?dist}
->>>>>>> 9cf1c8d963e567e95c4beabf7b3430fba00fa7c5
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2