security manager conflict commented

Dependencies:   microbit-dal2

Fork of microbit by Lancaster University

Committer:
LancasterUniversity
Date:
Wed Jul 13 13:00:19 2016 +0100
Revision:
8:e66291922b6c
Parent:
7:b70ce42be891
Child:
9:b48b1d1569e4
Synchronized with git rev 95a3a6b3
Author: James Devine
microbit: updated module.json to v2.0.0-rc2, and microbit-dal v2.0.0-rc2

Who changed what in which revision?

UserRevisionLine numberNew contents of line
Jonathan Austin 1:af427e419320 1 {
Jonathan Austin 1:af427e419320 2 "name": "microbit",
LancasterUniversity 8:e66291922b6c 3 "version": "2.0.0-rc2",
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 8:e66291922b6c 7 "microbit-dal": "lancaster-university/microbit-dal#v2.0.0-rc2"
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 }