security manager conflict commented

Dependencies:   microbit-dal2

Fork of microbit by Lancaster University

Committer:
Jonathan Austin
Date:
Thu Apr 07 01:30:13 2016 +0100
Revision:
1:af427e419320
Child:
7:b70ce42be891
Synchronized with git rev 5de0824717

Who changed what in which revision?

UserRevisionLine numberNew contents of line
Jonathan Austin 1:af427e419320 1 {
Jonathan Austin 1:af427e419320 2 "name": "microbit",
Jonathan Austin 1:af427e419320 3 "version": "1.0.0-rc1",
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": {
Jonathan Austin 1:af427e419320 7 "microbit-dal": "lancaster-university/microbit-dal#master"
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": {}
Jonathan Austin 1:af427e419320 13 }