Skip to content

Commit ad59729

Browse files
authored
Clarify licensing (#626)
* Delete LICENSE.txt * Update LICENSE
1 parent 7d2d9fc commit ad59729

File tree

2 files changed

+24
-22
lines changed

2 files changed

+24
-22
lines changed

LICENSE

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,3 +115,27 @@ Affirmer's express Statement of Purpose.
115115
For more information, please see
116116
<http://creativecommons.org/publicdomain/zero/1.0/>
117117

118+
---
119+
120+
Pixyll theme for Jekyll is Copyright (c) 2014 John Otander
121+
122+
MIT License
123+
124+
Permission is hereby granted, free of charge, to any person obtaining
125+
a copy of this software and associated documentation files (the
126+
"Software"), to deal in the Software without restriction, including
127+
without limitation the rights to use, copy, modify, merge, publish,
128+
distribute, sublicense, and/or sell copies of the Software, and to
129+
permit persons to whom the Software is furnished to do so, subject to
130+
the following conditions:
131+
132+
The above copyright notice and this permission notice shall be
133+
included in all copies or substantial portions of the Software.
134+
135+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
136+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
137+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
138+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
139+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
140+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
141+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

LICENSE.txt

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)