security manager conflict commented

Dependencies:   microbit-dal2

Fork of microbit by Lancaster University

Committer:
cristianobarbosa
Date:
Fri Jan 26 14:20:59 2018 +0000
Revision:
16:f21293a4597e
Parent:
11:b5c6d46127ad
sender

Who changed what in which revision?

UserRevisionLine numberNew contents of line
Jonathan Austin 1:af427e419320 1 {
Jonathan Austin 1:af427e419320 2 "name": "microbit",
LancasterUniversity 11:b5c6d46127ad 3 "version": "2.0.0-rc4",
Jonathan Austin 1:af427e419320 4 "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
Jonathan Austin 1:af427e419320 5 "license": "MIT",
Jonathan Austin 1:af427e419320 6 "dependencies": {
LancasterUniversity 10:066cffadc08f 7 "microbit-dal": "lancaster-university/microbit-dal"
Jonathan Austin 1:af427e419320 8 },
Jonathan Austin 1:af427e419320 9 "extraIncludes": [
Jonathan Austin 1:af427e419320 10 "inc"
Jonathan Austin 1:af427e419320 11 ],
Jonathan Austin 1:af427e419320 12 "targetDependencies": {}
LancasterUniversity 7:b70ce42be891 13 }