From: Michael P. <mic...@gm...> - 2014-01-30 13:29:58
|
> commit 1914b997320f06f1a2a4daba0595dd49b192c863 > Author: Koichi Suzuki <koi...@gm...> > Date: Thu Jan 30 18:53:01 2014 +0900 You should perhaps double-check the code with some grepping, there are still some rests of git conflicts. Here is for example one in ./configure: <<<<<<< HEAD Postgres-XC config.status 1.1devel ======= PostgreSQL config.status 9.3beta1 >>>>>>> e472b921406407794bab911c64655b8b82375196 Regards, -- Michael |