Merge pull request #375 from marwahaha/patch-1

an -> and

Merge pull request #375 from marwahaha/patch-1
an -> and
a499b32f · Raniere Silva · GitHub · 0459f993 · 7d3cf53a · a499b32f
Commit a499b32f authored Jan 06, 2017 by Raniere Silva Committed by GitHub Jan 06, 2017
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -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/