From 489332de66d4964937bd7fae5952ff425fd6135a Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Thu, 13 Oct 2011 09:55:00 -0400 Subject: [PATCH] Fix merge conflict --- moonshot/mech_eap/Makefile.am | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/moonshot/mech_eap/Makefile.am b/moonshot/mech_eap/Makefile.am index 5b41921..8c6f64c 100644 --- a/moonshot/mech_eap/Makefile.am +++ b/moonshot/mech_eap/Makefile.am @@ -125,15 +125,13 @@ mech_eap_la_SOURCES = \ util_saml.h \ util_shib.h -<<<<<<< HEAD if LIBMOONSHOT mech_eap_la_SOURCES += util_moonshot.c mech_eap_la_CFLAGS += @LIBMOONSHOT_CFLAGS@ mech_eap_la_LDFLAGS += @LIBMOONSHOT_LDFLAGS@ mech_eap_la_LIBADD += @LIBMOONSHOT_LIBS@ endif -======= ->>>>>>> 8d229bd... make dist: distribute sources + if GSSEAP_ENABLE_ACCEPTOR -- 2.1.4