diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-11-11 13:33:16 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-11-11 13:33:16 +0100 |
| commit | 8f7d3d2fccc097c85cc403b58df6c5fc35418579 (patch) | |
| tree | 5bc1ef2a75abb0d85a3ab2cece365eed9e516470 /user_guide_src/cilexer | |
| parent | 4f50256a84e8052fc3356683f28286d36f8a322c (diff) | |
| parent | 81c934729d9fcbb294a8914608c315eed30ff9c4 (diff) | |
Fix merge conflicts
Diffstat (limited to 'user_guide_src/cilexer')
| -rw-r--r-- | user_guide_src/cilexer/cilexer/cilexer.py | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/user_guide_src/cilexer/cilexer/cilexer.py b/user_guide_src/cilexer/cilexer/cilexer.py index e9834ecb1..e4d25d772 100644 --- a/user_guide_src/cilexer/cilexer/cilexer.py +++ b/user_guide_src/cilexer/cilexer/cilexer.py @@ -3,22 +3,30 @@ # # An open source application development framework for PHP 5.2.4 or newer # -# NOTICE OF LICENSE -# -# Licensed under the Open Software License version 3.0 -# -# This source file is subject to the Open Software License (OSL 3.0) that is -# bundled with this package in the files license.txt / license.rst. It is -# also available through the world wide web at this URL: -# http://opensource.org/licenses/OSL-3.0 -# If you did not receive a copy of the license and are unable to obtain it -# through the world wide web, please send an email to -# licensing@ellislab.com so we can send you a copy immediately. -# +# This content is released under the MIT License (MIT) +# +# 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. +# # Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/) -# http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) - - +# Copyright (c) 2014, British Columbia Institute of Technology (http://bcit.ca/) +# +# http://opensource.org/licenses/MIT MIT License import re import copy |