pgpool2.git / summary / log / commit / refs

commit    b878bbbc2615d1eec8b5b2fe0ade87b773290b35
Author:   Nozomi Anzai <anzai@sraoss.co.jp>
Date:     Fri May 10 05:41:59 2013 +0000

    Added the right file. I commited the conflicted one.


 sql/pgpool-recovery/pgpool-recovery.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sql/pgpool-recovery/pgpool-recovery.c b/sql/pgpool-recovery/pgpool-recovery.c
index 85c1e9ace..32061ef74 100644
--- a/sql/pgpool-recovery/pgpool-recovery.c
+++ b/sql/pgpool-recovery/pgpool-recovery.c
@@ -29,13 +29,10 @@
 #include "catalog/namespace.h"
 #include "utils/syscache.h"
 #include "utils/builtins.h"		/* PostgreSQL 8.4 needs this for textout */
-<<<<<<< HEAD
 #include "utils/guc.h"
-=======
 #if defined(PG_VERSION_NUM) && (PG_VERSION_NUM >= 90300)
 #include "access/htup_details.h"		/* PostgreSQL 9.3 or later needs this */
 #endif
->>>>>>> 641ef2ff314d2a9336a37bb29cae686fb3849346
 
 #define REMOTE_START_FILE "pgpool_remote_start"
 


[parent: 74fdfacf7adb]