You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marvin.apache.org by yi...@apache.org on 2018/11/28 18:26:11 UTC

[incubator-marvin-website] 28/31: Bootstrap v3.0.2 is Apache not MIT license

This is an automated email from the ASF dual-hosted git repository.

yifeizhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-marvin-website.git

commit a257f7e4d886b98470ae9b391e9923cc61f55f49
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Sat Oct 8 10:06:33 2016 +1100

    Bootstrap v3.0.2 is Apache not MIT license
---
 LICENSE | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/LICENSE b/LICENSE
index 76ded66..6aa7125 100644
--- a/LICENSE
+++ b/LICENSE
@@ -226,32 +226,6 @@ THE SOFTWARE.
 
 ------------------
 
-- Bootstrap
-
-The MIT License (MIT)
-
-Copyright (c) 2011-2015 Twitter, Inc
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-------------------
-
 - jQuery
 
 Copyright jQuery Foundation and other contributors, https://jquery.org/