From 3f4ff5a8624a894b112b86cd9098bad622cd4f52 Mon Sep 17 00:00:00 2001
From: Jaime Casanova <jaime@2ndQuadrant.com>
Date: Fri, 10 Jun 2011 21:16:07 -0500
Subject: [PATCH] A "HEAD" word remaining from a merge conflict was
 accidentally left in... removing it

---
 config.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/config.c b/config.c
index f58c80ab..29dd25cc 100644
--- a/config.c
+++ b/config.c
@@ -170,8 +170,6 @@ parse_line(char *buff, char *name, char *value)
 	trim(value);
 }
 
-<<<<<<< HEAD:config.c
-
 bool
 reload_configuration(char *config_file, t_configuration_options *orig_options)
 {