Skip to content

Commit

Permalink
Merge remote-tracking branch 'cocot/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	ReadMe.md
  • Loading branch information
damian-m-g committed Sep 27, 2018
2 parents bb6af8c + a80f763 commit f6d25dc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions License.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2015 cocot
Copyright (c) 2016 cocot

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
Expand All @@ -11,4 +11,4 @@ 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.
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

0 comments on commit f6d25dc

Please sign in to comment.