SourceFormat Enforcement

diff --git a/include/getaddrinfo.h b/include/getaddrinfo.h
index 2ac142513a7befaa2610b99f1000ad4a1dd359aa..f0ca67ace22bb5df3b82245c275e2de49abe70b6 100644 (file)
--- 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 */