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:
1:af427e419320
sender

Who changed what in which revision?

UserRevisionLine numberNew contents of line
Jonathan Austin 1:af427e419320 1 The MIT License (MIT)
Jonathan Austin 1:af427e419320 2
Jonathan Austin 1:af427e419320 3 Copyright (c) 2016 British Broadcasting Corporation.
Jonathan Austin 1:af427e419320 4 This software is provided by Lancaster University by arrangement with the BBC.
Jonathan Austin 1:af427e419320 5
Jonathan Austin 1:af427e419320 6 Permission is hereby granted, free of charge, to any person obtaining a
Jonathan Austin 1:af427e419320 7 copy of this software and associated documentation files (the "Software"),
Jonathan Austin 1:af427e419320 8 to deal in the Software without restriction, including without limitation
Jonathan Austin 1:af427e419320 9 the rights to use, copy, modify, merge, publish, distribute, sublicense,
Jonathan Austin 1:af427e419320 10 and/or sell copies of the Software, and to permit persons to whom the
Jonathan Austin 1:af427e419320 11 Software is furnished to do so, subject to the following conditions:
Jonathan Austin 1:af427e419320 12
Jonathan Austin 1:af427e419320 13 The above copyright notice and this permission notice shall be included in
Jonathan Austin 1:af427e419320 14 all copies or substantial portions of the Software.
Jonathan Austin 1:af427e419320 15
Jonathan Austin 1:af427e419320 16 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
Jonathan Austin 1:af427e419320 17 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
Jonathan Austin 1:af427e419320 18 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
Jonathan Austin 1:af427e419320 19 THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
Jonathan Austin 1:af427e419320 20 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
Jonathan Austin 1:af427e419320 21 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
Jonathan Austin 1:af427e419320 22 DEALINGS IN THE SOFTWARE.