From: Sam Hartman <hartmans@debian.org>
Date: Thu, 13 Oct 2011 13:55:00 +0000 (-0400)
Subject: Fix merge conflict
X-Git-Tag: tr-beta1~63
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot.git;a=commitdiff_plain;h=489332de66d4964937bd7fae5952ff425fd6135a

Fix merge conflict
---

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