Permalink
Browse files

USBrfm12stick: fix merge

  • Loading branch information...
1 parent 23c458b commit 43a212c6360fb16c46bddb8d76ee6bf3a8bcb283 @habo habo committed May 31, 2011
Showing with 0 additions and 4 deletions.
  1. +0 −4 pinning/hardware/USBrfm12stick.m4
@@ -17,11 +17,7 @@ RFM12_ASK_SENSE_USE_INT(1)
/* port the rfm12 module CS is attached to */
pin(SPI_CS_RFM12, PC2, OUTPUT)
-<<<<<<< HEAD
dnl RFM12_USE_PCINT(0, PB0) dnl PCINT0
-=======
-RFM12_USE_PCINT(0, PB0) dnl PCINT0
->>>>>>> d863031... USB Stick Hardware: example with USB-NET and ASK
pin(STATUSLED_TX, PD5, OUTPUT)

0 comments on commit 43a212c

Please sign in to comment.