From 98f36517251b5bccdb80d90d698c173c18ee4a29 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 28 Aug 2003 00:26:05 +0000 Subject: implemented merging an patch making git-svn-id: file:///home/lennart/svn/public/syrep/trunk@9 07ea20a6-d2c5-0310-9e02-9ef735347d72 --- src/merge.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/merge.h') diff --git a/src/merge.h b/src/merge.h index 2b88712..17d3fc0 100644 --- a/src/merge.h +++ b/src/merge.h @@ -3,6 +3,6 @@ #include "context.h" -int merge_snapshot(struct syrep_db_context *c1, struct syrep_db_context *c2, const char* root); +int merge(struct syrep_db_context *c1, struct syrep_db_context *c2, const char* root); #endif -- cgit