From ce23e399a256dff87b28269a3a4fb4a55f27cac5 Mon Sep 17 00:00:00 2001 From: Automatic source maintenance Date: Sat, 27 Aug 2011 00:39:37 -0600 Subject: [PATCH] SourceFormat Enforcement --- include/getaddrinfo.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 */ -- 2.47.2