Skip to content

Commit 02c4c55

Browse files
author
Javier de Silóniz Sandino
committed
Updated README license
1 parent 02c3f43 commit 02c4c55

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
identification within third-party archives.
188188

189189
Copyright 2012 Manning Publications, Co.
190-
Copyright 2016 47 Degrees, LLC
190+
Copyright 2015-16 47 Degrees, LLC
191191

192192
Licensed under the Apache License, Version 2.0 (the "License");
193193
you may not use this file except in compliance with the License.
@@ -203,7 +203,7 @@
203203

204204

205205
Copyright (c) 2012, Manning Publications, Co.
206-
Copyright (c) 2016, 47 Degrees, LLC
206+
Copyright (c) 2015-16, 47 Degrees, LLC
207207

208208
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
209209
documentation files (the "Software"), to deal in the Software without restriction, including without limitation the

README.md

+19-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ to get involved, or visit our [GitHub site](https://github.com/scala-exercises).
2020

2121
##License
2222

23+
Copyright (C) 2012 Manning Publications, Co.
2324
Copyright (C) 2015-2016 47 Degrees, LLC.
2425
Reactive, scalable software solutions.
2526
http://47deg.com
@@ -35,4 +36,21 @@ Unless required by applicable law or agreed to in writing, software
3536
distributed under the License is distributed on an "AS IS" BASIS,
3637
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
3738
See the License for the specific language governing permissions and
38-
limitations under the License.
39+
limitations under the License.
40+
41+
42+
Copyright (c) 2012, Manning Publications, Co.
43+
Copyright (c) 2015-16, 47 Degrees, LLC
44+
45+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
46+
documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
47+
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
48+
persons to whom the Software is furnished to do so, subject to the following conditions:
49+
50+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
51+
Software.
52+
53+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
54+
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
55+
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
56+
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

0 commit comments

Comments
 (0)