[Pkg-running-devel] [openambit] 34/131: Fixed merge error

[Christian Perrier]

This is an automated email from the git hooks/post-receive script.

bubulle pushed a commit to branch master
in repository openambit.

commit 4677f0ebce06c529b79d2b9d8c1c00f0a340e90c
Author: Emil Ljungdahl <emil at kratern.se>
Date:   Thu Jan 9 23:20:04 2014 +0100

    Fixed merge error
---
 src/libambit/pmem20.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libambit/pmem20.c b/src/libambit/pmem20.c
index dde3010..965ee27 100644
--- a/src/libambit/pmem20.c
+++ b/src/libambit/pmem20.c
@@ -138,7 +138,7 @@ int libambit_pmem20_log_next_header(ambit_object_t *object, ambit_log_header_t *
             tmp_len = read16inc(object->pmem20.log.buffer, &buffer_offset);
             buffer_offset += tmp_len;
             tmp_len = read16inc(object->pmem20.log.buffer, &buffer_offset);
-            if (libambit_pmem20_parse_header(object->pmem20.log.buffer + buffer_offset, tmp_len, log_header) == 0) {
+            if (libambit_pmem20_log_parse_header(object->pmem20.log.buffer + buffer_offset, tmp_len, log_header) == 0) {
                 ret = 1;
             }
         }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-running/openambit.git