Skip to content

Commit

Permalink
feature: Fixing conflicts
Browse files Browse the repository at this point in the history 
Co-authored-by: Alan Marques <[email protected]>
  • Loading branch information
@MaiconMares @alan-ms
MaiconMares and alan-ms committed Apr 23, 2022
1 parent 8969b9d commit 2e2960e
Show file tree
Hide file tree
Showing 2 changed files with 92 additions and 88 deletions.
166 changes: 85 additions & 81 deletions NOTICE-ruby
View file
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ limitations under the License.

------

** pg; version 1.3.4 --
** pg; version 1.3.5 --
Copyright (c) 1997-2019 by the
Portions copyright LAIKA, Inc.
Copyright (c) 1993-2013 Yukihiro Matsumoto
Expand Down Expand Up @@ -557,7 +557,7 @@ SUCH DAMAGE.

------

** puma; version 5.6.2 --
** puma; version 5.6.4 --
Zed Shaw, (c) 2005
Copyright (c) 2005 Zed A. Shaw
Copyright (c) 2011 Evan Phoenix
Expand Down Expand Up @@ -994,7 +994,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

------

** rubocop-ast; version 1.16.0 --
** rubocop-ast; version 1.17.0 --
Copyright (c) 2012-20 Bozhidar Batsov

Copyright (c) 2012-20 Bozhidar Batsov
Expand Down Expand Up @@ -1197,36 +1197,6 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


------

** countries; version 4.2.2 --
Copyright (c) 2012 hexorx
Copyright (c) 2016 hexorx

Copyright (c) 2012 hexorx

MIT License

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.


------

** multi_json; version 1.15.0 --
Expand Down Expand Up @@ -1868,7 +1838,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

------

** loofah; version 2.14.0 --
** loofah; version 2.16.0 --
Copyright (c) 2006-2008 The Authors
Copyright (c) 2009 2018 by Mike Dalessio, Bryan Helmkamp

Expand Down Expand Up @@ -2365,8 +2335,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

------

** simple_po_parser; version 1.1.5 --
Copyright (c) 2012
** simple_po_parser; version 1.1.6 --
Copyright (c) 2012 damned-lies's
Copyright (c) 2017 Dennis-Florian Herr Experteer GmbH

Copyright (c) 2017 Dennis-Florian Herr @ Experteer GmbH
Expand Down Expand Up @@ -2422,6 +2392,39 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


------

** countries; version 4.2.3 --
Copyright (c) 2012-2015 hexorx
Copyright (c) 2015-2021 hexorx, rposborne
Copyright (c) 2022 hexorx, rposborne, pmor

Copyright (c) 2012-2015 hexorx
Copyright (c) 2015-2021 hexorx, rposborne
Copyright (c) 2022 hexorx, rposborne, pmor

MIT License

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.


------

** listen; version 3.7.1 --
Expand Down Expand Up @@ -2575,7 +2578,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

------

** rubocop; version 1.26.0 --
** rubocop; version 1.27.0 --
Copyright (c) 2015 Mikko Kokkonen
Copyright (c) 2012-22 Bozhidar Batsov
Copyright (c) 2012-2022 Bozhidar Batsov
Expand Down Expand Up @@ -2627,10 +2630,10 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

------

** concurrent-ruby; version 1.1.9 --
** concurrent-ruby; version 1.1.10 --
Copyright Concurrent Ruby
Copyright (c) Jerry D'Antonio
Copyright (c) 2014 Jerry D'Antonio (https://twitter.com/jerrydantonio).
Copyright (c) 2014 Jerry D'Antonio (https://twitter.com/jerrydantonio)

Copyright (c) Jerry D'Antonio -- released under the MIT license.

Expand Down Expand Up @@ -2829,7 +2832,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

------

** parallel; version 1.22.0 --
** parallel; version 1.22.1 --
Copyright (c) 2013 Michael Grosser <[email protected]>

Copyright (C) 2013 Michael Grosser <[email protected]>
Expand Down Expand Up @@ -3118,7 +3121,7 @@ Copyright (c) 2016, Matthew Kerwin <[email protected]>
Copyright, 2016, by Matthew Kerwin (http://kerwin.net.au).
Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
Copyright, 2016, by Samuel G. D. Williams (http://www.codeotaku.com/samuel-williams).
** i18n_data; version 0.15.0 --
** i18n_data; version 0.16.0 --
** i18n-js; version 3.8.0 --
Copyright (c) 2008-2011 Pivotal Labs
Copyright (c) 2010-2015, The Dojo Foundation
Expand Down Expand Up @@ -3479,6 +3482,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------

** semantic_range; version 3.0.0 --
Copyright (c) 2016 Andrew Nesbitt

The MIT License (MIT)

Expand Down Expand Up @@ -3700,7 +3704,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

------

** regexp_parser; version 2.2.1 --
** regexp_parser; version 2.3.0 --
(c) d enter group
(c) visit literal c exit group
(c) visit literal d exit group
Expand Down Expand Up @@ -3764,7 +3768,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

------

** request_store; version 1.5.0 --
** request_store; version 1.5.1 --
Copyright (c) 2012 Steve Klabnik

Copyright (c) 2012 Steve Klabnik
Expand Down Expand Up @@ -3945,7 +3949,7 @@ SOFTWARE.

------

** lograge; version 0.11.2 --
** lograge; version 0.12.0 --
Copyright (c) 2016 Mathias Meyer

The MIT License (MIT)
Expand Down Expand Up @@ -4030,41 +4034,6 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


------

** nokogiri; version 1.13.3 --
Copyright 2010 Google Inc.
Copyright 2011 Google Inc.
Copyright 2018 Craig Barnes
Copyright 2017-2018 Craig Barnes
Copyright 2018 Stephen Checkoway
(c) Copyright 2002-2005, Andy Clark
Copyright (c) 1998-2003 Daniel Veillard
Copyright (c) 1998-2012 Daniel Veillard
Copyright (c) 2001-2002 Daniel Veillard
copyrighted by the Free Software Foundation
Copyright 2013-2021 Sam Ruby, Stephen Checkoway
Copyright (c) 1991 Free Software Foundation, Inc.
Copyright 1992-2018 Free Software Foundation, Inc.
Copyright 1992-2020 Free Software Foundation, Inc.
Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
Copyright (c) 2001-2003 Thai Open Source Software Center Ltd
Copyright (c) 2008-2009 Bjoern Hoehrmann <[email protected]>
Copyright (c) 2001-2002 Thomas Broyer, Charlie Bozeman and Daniel Veillard
Copyright (c) 2001-2002, SourceForge ISO-RELAX Project (ASAMI Tomoharu, Daisuke Okajima, Kohsuke Kawaguchi, and MURATA Makoto)
Copyright 2008 2021 by Mike Dalessio, Aaron Patterson, Yoko Harada, Akinori MUSHA, John Shahid, Karol Bucek, Sam Ruby, Craig Barnes, Stephen Checkoway, Lars Kanis, Sergio Arbeo, Timothy Elliott, Nobuyoshi Nakada, Charles Nutter, Patrick Mahoney

The MIT License

Copyright 2008 -- 2021 by Mike Dalessio, Aaron Patterson, Yoko Harada, Akinori MUSHA, John Shahid, Karol Bucek, Sam Ruby, Craig Barnes, Stephen Checkoway, Lars Kanis, Sergio Arbeo, Timothy Elliott, Nobuyoshi Nakada, Charles Nutter, Patrick Mahoney.

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.


------

** hashdiff; version 1.0.1 --
Expand Down Expand Up @@ -4295,6 +4264,41 @@ Exceptions
* lib/test/unit/diff.rb: This license and PSF license


------

** nokogiri; version 1.13.4 --
Copyright 2010 Google Inc.
Copyright 2011 Google Inc.
Copyright 2018 Craig Barnes
Copyright 2017-2018 Craig Barnes
Copyright 2018 Stephen Checkoway
(c) Copyright 2002-2005, Andy Clark
Copyright (c) 1998-2003 Daniel Veillard
Copyright (c) 1998-2012 Daniel Veillard
Copyright (c) 2001-2002 Daniel Veillard
copyrighted by the Free Software Foundation
Copyright 2013-2021 Sam Ruby, Stephen Checkoway
Copyright (c) 1991 Free Software Foundation, Inc.
Copyright 1992-2018 Free Software Foundation, Inc.
Copyright 1992-2020 Free Software Foundation, Inc.
Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
Copyright (c) 2001-2003 Thai Open Source Software Center Ltd
Copyright (c) 2008-2009 Bjoern Hoehrmann <[email protected]>
Copyright (c) 2001-2002 Thomas Broyer, Charlie Bozeman and Daniel Veillard
Copyright (c) 2001-2002, SourceForge ISO-RELAX Project (ASAMI Tomoharu, Daisuke Okajima, Kohsuke Kawaguchi, and MURATA Makoto)
Copyright 2008 2021 by Mike Dalessio, Aaron Patterson, Yoko Harada, Akinori MUSHA, John Shahid, Karol Bucek, Sam Ruby, Craig Barnes, Stephen Checkoway, Lars Kanis, Sergio Arbeo, Timothy Elliott, Nobuyoshi Nakada, Charles Nutter, Patrick Mahoney

The MIT License

Copyright 2008 -- 2021 by Mike Dalessio, Aaron Patterson, Yoko Harada, Akinori MUSHA, John Shahid, Karol Bucek, Sam Ruby, Craig Barnes, Stephen Checkoway, Lars Kanis, Sergio Arbeo, Timothy Elliott, Nobuyoshi Nakada, Charles Nutter, Patrick Mahoney.

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.


------

** marcel; version 1.0.2 --
Expand Down Expand Up @@ -4535,8 +4539,8 @@ Apache-2.0 OR (Artistic-2.0 OR (BSD-3-Clause OR (GPL-3.0 OR (MIT OR MPL-2.0))))

------

** debug; version 1.4.0 --
Copyright (c) 1993-2013 Yukihiro Matsumoto.
** debug; version 1.5.0 --
Copyright (c) 1993-2013 Yukihiro Matsumoto
** io-console; version 0.5.11 --
Copyright (c) 1993-2013 Yukihiro Matsumoto.
** irb; version 1.4.1 --
Expand Down
14 changes: 7 additions & 7 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10880,9 +10880,9 @@ [email protected]:
kind-of "^6.0.3"

minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
version "1.2.5"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
version "1.2.6"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==

minipass-collect@^1.0.2:
version "1.0.2"
Expand Down Expand Up @@ -10988,10 +10988,10 @@ moment-timezone@^0.5.21:
dependencies:
moment ">= 2.9.0"

[email protected], "moment@>= 2.9.0", moment@>=2.14.0, moment@^2.10.2, moment@^2.22.2:
version "2.29.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
[email protected], "moment@>= 2.9.0", moment@>=2.14.0, moment@^2.10.2, moment@^2.29.2:
version "2.29.2"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz#00910c60b20843bcba52d37d58c628b47b1f20e4"
integrity sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==

moo@^0.5.0:
version "0.5.1"
Expand Down

0 comments on commit 2e2960e

Please sign in to comment.