Skip to content

Commit

Permalink
post-merge updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Cam O'Connell committed Dec 17, 2018
1 parent 3e2ab41 commit 7e7c32b
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 23 deletions.
36 changes: 15 additions & 21 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
The MIT License (MIT)

Copyright (c) 2013-present, Yuxi (Evan) You

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.
Lazy Line Painter - A Modern JS library for SVG path animation.
Copyright © 2018 Cam O'Connell

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License along
with this program. If not, see http://www.gnu.org/licenses/.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "lazy-line-painter",
"version": "1.9.0",
"description": "A js library for SVG path animation",
"description": "A Modern JS library for SVG path animation",
"main": "lib/lazy-line-painter-1.9.0.js",
"directories": {},
"scripts": {
Expand Down Expand Up @@ -43,7 +43,7 @@
"yargs": "^10.0.3"
},
"author": "cam o'connell <oi@merriment.info> (http://lazylinepainter.info)",
"license": "MIT",
"license": "GNU",
"bugs": {
"url": "https://github.com/camoconnell/lazy-line-painter/issues"
},
Expand Down

0 comments on commit 7e7c32b

Please sign in to comment.