From ee17f851cb0ebc2e0607a33be29c3b2fe5970f09 Mon Sep 17 00:00:00 2001 From: Fabien Thomas Date: Fri, 7 Jul 2006 16:35:21 +0000 Subject: [PATCH] remove commited conflict git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1110 fd59a12c-fef9-0310-b244-a6a79926bd2f --- exec/clm.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/exec/clm.c b/exec/clm.c index 54b007ce..599dbb05 100644 --- a/exec/clm.c +++ b/exec/clm.c @@ -306,11 +306,7 @@ static int clm_exec_init_fn (struct objdb_iface_ver0 *objdb) if ( sysctl(mib, 2, &boot_time, &size, NULL, 0) == -1 ) boot_time.tv_sec = time (NULL); /* (currenttime (s) - uptime (s)) * 1 billion (ns) / 1 (s) */ -<<<<<<< .mine my_cluster_node.boot_timestamp = ((SaTimeT)boot_time.tv_sec) * 1000000000; -======= - my_cluster_node.boot_timestmap = ((SaTimeT)boot_time.tv_sec) * 1000000000; ->>>>>>> .r1070 #else /* defined(CTL_KERN) && defined(KERN_BOOTTIME) */ #warning "no bootime support" #endif