Merge branch 'gp/branch'

diff --git a/lockfile.c b/lockfile.c
index 23db35aff21d7c33197726128e2f120291e6e9f0..5ad2858b4885022141d915fa0555c51f80d11c1c 100644 (file)
--- a/lockfile.c
+++ b/lockfile.c
@@ -97,4 +97,3 @@ void rollback_lock_file(struct lock_file *lk)
                unlink(lk->filename);
        lk->filename[0] = 0;
 }
-