X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=mech_eap%2FMakefile.am;h=8c6f64c55839e73d918e9094ab75eb908e3d1c6b;hb=3d5083e8a273503d6d5233195d2ee7cb2e754e6d;hp=5b419219540b930b999f7a41c3f264824f515d0d;hpb=2b9e4c92fe63c5ac3a24f15e9b713543ac3ade23;p=mech_eap.orig

diff --git a/mech_eap/Makefile.am b/mech_eap/Makefile.am
index 5b41921..8c6f64c 100644
--- a/mech_eap/Makefile.am
+++ b/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