projects
/
mech_eap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a3765f5
)
Fix merge conflict
author
Sam Hartman
<hartmans@debian.org>
Thu, 13 Oct 2011 13:55:00 +0000
(09:55 -0400)
committer
Sam Hartman
<hartmans@debian.org>
Thu, 13 Oct 2011 13:55:00 +0000
(09:55 -0400)
mech_eap/Makefile.am
patch
|
blob
|
history
diff --git
a/mech_eap/Makefile.am
b/mech_eap/Makefile.am
index
5b41921
..
8c6f64c
100644
(file)
--- 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