Fix formatting errors from merge
Fix formatting errors from merge

jvanmalder/ttn,TheThingsNetwork/ttn,TheThingsNetwork/ttn,LoRaWanSoFa/ttn,mgranberry/ttn,jvanmalder/ttn,jvanmalder/ttn,LoRaWanSoFa/ttn,TheThingsNetwork/ttn,mgranberry/ttn,mgranberry/ttn