Frank Vannieuwkerke / cc3000_hostdriver_mbedsocket

cc3000 hostdriver with the mbed socket interface

Fork of cc3000_hostdriver_mbedsocket by Martin Kojtal

Diff: cc3000.h

Revision:
27:5118ab0f6aa4
Parent:
26:456f73ed2a75
Child:
29:c40918cd9b6d
diff -r 456f73ed2a75 -r 5118ab0f6aa4 cc3000.h
--- a/cc3000.h	Fri Oct 04 07:04:20 2013 +0000
+++ b/cc3000.h	Fri Oct 04 07:06:29 2013 +0000
@@ -115,11 +115,7 @@
     #endif
     
 #else
-<<<<<<< local
     #define DBG_CC(x, ...)
-=======
-    #define DBG_HCI_CMD(x, ...)
->>>>>>> other
 #endif
 
 namespace mbed_cc3000 {