From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 1 Aug 2011 20:45:50 +0000 (+0000)
Subject: LRN:  Resolve an overlooked merge conflict
X-Git-Tag: initial-import-from-subversion-38251~17543
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5a827fc9c6c618a9aadeb3917db0edd0d98a5ab0;p=oweals%2Fgnunet.git

LRN:  Resolve an overlooked merge conflict
---

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 06f09e227..7a9f7cad2 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -62,11 +62,9 @@ UNIX_QUOTA_TEST = test_quota_compliance_unix \
      test_quota_compliance_unix_asymmetric_recv_constant
 endif
 
-<<<<<<< HEAD
-=======
-noinst_PROGRAMS = ${check_PROGRAMS} gnunet-transport-certificate-creation
+noinst_PROGRAMS = ${check_PROGRAMS} $(WLAN_BIN_DUMMY)
+
 
->>>>>>> Let gnunet-transport-certificate-creation be a program
 lib_LTLIBRARIES = \
   libgnunettransport.la 
 
@@ -91,10 +89,6 @@ bin_PROGRAMS = \
  gnunet-transport-list-connections \
  gnunet-transport-certificate-creation
 
-#noinst_PROGRAMS = ${check_PROGRAMS}
-noinst_PROGRAMS = \
- $(WLAN_BIN_DUMMY)
-
 #bin_SCRIPTS = \
 # gnunet-transport-certificate-creation