Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #375 from marwahaha/patch-1 
an -> and
  • Loading branch information
Raniere Silva authored and GitHub committed Jan 6, 2017
2 parents 0459f99 + 7d3cf53 commit a499b32
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion LICENSE.md
View file
Expand Up @@ -73,7 +73,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

## Trademark

"Software Carpentry" an "Data Carpentry" and their respective logos
"Software Carpentry" and "Data Carpentry" and their respective logos
are registered trademarks of [NumFOCUS][numfocus].

[cc-by-human]: https://creativecommons.org/licenses/by/4.0/
Expand Down

0 comments on commit a499b32

Please sign in to comment.