This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Resolve merge conflict

  • Loading branch information...
bennuttall committed Mar 22, 2016
1 parent f5e14de commit f167816681b2635a0ce381740ae331b03d22948f
Showing with 0 additions and 3 deletions.
  1. +0 −3 hardware.yml
View
@@ -1,9 +1,6 @@
- name: 1 x Morse Code key
img: morse-key
url: http://www.nevadaradio.co.uk/amateur-radio/morse-keys/mfj-550
- name: 2 (or more) x Male-to-female jumper wires
img: jumper-male-to-female
url: http://shop.pimoroni.com/products/jumper-jerky
- name: Headphones or speakers
img: headphones-speaker
url: http://thepihut.com/products/mini-portable-speaker-for-the-raspberry-pi

0 comments on commit f167816

Please sign in to comment.