------------------------------------------------------------
revno: 12302
revision-id: squid3@treenet.co.nz-20120828130448-iqiy6eq4oj3k3b25
parent: squidadm@squid-cache.org-20120828130030-ch79kwso5hi69kex
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Tue 2012-08-28 07:04:48 -0600
message:
  Cleanup: duplicate include of squid.h
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20120828130448-iqiy6eq4oj3k3b25
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: e499357840296c40e4330b07e125d648db14977d
# timestamp: 2012-08-28 13:08:28 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squidadm@squid-cache.org-20120828130030-\
#   ch79kwso5hi69kex
# 
# Begin patch
=== modified file 'src/DiskIO/DiskIOStrategy.h'
--- src/DiskIO/DiskIOStrategy.h	2012-08-14 11:53:07 +0000
+++ src/DiskIO/DiskIOStrategy.h	2012-08-28 13:04:48 +0000
@@ -33,7 +33,6 @@
 #ifndef SQUID_DISKIOSTRATEGY_H
 #define SQUID_DISKIOSTRATEGY_H
 
-#include "squid.h"
 #include "Store.h"
 #include "RefCount.h"