Fix theirs conflict merge conflict revision 2402

git-svn-id: http://svn.fedorahosted.org/svn/corosync/branches/flatiron@2451 fd59a12c-fef9-0310-b244-a6a79926bd2f

tools/Makefile.am

@@ -42,8 +42,6 @@ corosync_objctl_LDADD	= -lconfdb ../lcr/liblcr.a -lcoroipcc
 corosync_objctl_LDFLAGS	= -L../lib
 corosync_cfgtool_LDADD	= -lcfg -lcoroipcc
 corosync_cfgtool_LDFLAGS= -L../lib
-corosync_cpgtool_LDADD	= -lcfg -lcpg -lcoroipcc
-corosync_cpgtool_LDFLAGS= -L../lib
 
 lint:
 	-splint $(LINT_FLAGS) $(CFLAGS) *.c