From: Automatic source maintenance <squidadm@squid-cache.org>
Date: Sat, 27 Aug 2011 06:39:37 +0000 (-0600)
Subject: SourceFormat Enforcement
X-Git-Tag: SQUID_3_1_15~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce23e399a256dff87b28269a3a4fb4a55f27cac5;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/include/getaddrinfo.h b/include/getaddrinfo.h
index 2ac142513a..f0ca67ace2 100644
--- a/include/getaddrinfo.h
+++ b/include/getaddrinfo.h
@@ -111,11 +111,11 @@ SQUIDCEXTERN const char *xgai_strerror (int code);
 <<<<<<< TREE
 =======
 #if !defined(gai_strerror)
->>>>>>> MERGE-SOURCE
-<<<<<<< TREE
-=======
+    >>>>>>> MERGE-SOURCE
+    <<<<<<< TREE
+    =======
 #endif
->>>>>>> MERGE-SOURCE
+        >>>>>>> MERGE-SOURCE
 
 #endif /* HAVE_GETADDRINFO */