fixed conflict.
authorJoe Milbourn <joe.milbourn+git@gmail.com>
Fri, 4 Jun 2010 09:33:11 +0000 (10:33 +0100)
committerJoe Milbourn <joe.milbourn+git@gmail.com>
Fri, 4 Jun 2010 09:33:11 +0000 (10:33 +0100)
1  2 
radio/index.mdwn

@@@ -1,4 -1,4 +1,4 @@@
-  * Callsign: ~~[MM3ZRN]~~ [2M0ZRN]
 - * Callsign: [MM3ZRN][]
++ * Callsign: ~~[MM3ZRN][]~~ [2M0ZRN][]
   * Locator: [IO86NJ][]
   * [BandPlans][]