[GNUnet-SVN] r16301 - gnunet/src/transport

[gnunet]

Author: grothoff
Date: 2011-08-01 22:45:50 +0200 (Mon, 01 Aug 2011)
New Revision: 16301

Modified:
   gnunet/src/transport/Makefile.am
Log:
LRN:  Resolve an overlooked merge conflict


Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am    2011-08-01 20:45:24 UTC (rev 16300)
+++ gnunet/src/transport/Makefile.am    2011-08-01 20:45:50 UTC (rev 16301)
@@ -62,11 +62,9 @@
      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 @@
  gnunet-transport-list-connections \
  gnunet-transport-certificate-creation
 
-#noinst_PROGRAMS = ${check_PROGRAMS}
-noinst_PROGRAMS = \
- $(WLAN_BIN_DUMMY)
-
 #bin_SCRIPTS = \
 # gnunet-transport-certificate-creation