From 504815d117519423a2c4a8a5ee29d011513a2307 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 24 Jan 2018 11:05:39 -0500 Subject: [PATCH 1/2] Merge pull request #34825 from Anonmare/patch-3 Buffs the Contributing Guide (Fixes a typo) --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 264ad58973..fd68d28d72 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -387,7 +387,7 @@ Do not add any of the following in a Pull Request or risk getting the PR closed: * Code where one line of code is split across mutiple lines (except for multiple, separate strings and comments; in those cases, existing longer lines must not be split up) * Code adding, removing, or updating the availability of alien races/species/human mutants without prior approval. Pull requests attempting to add or remove features from said races/species/mutants require prior approval as well. -Just becuase something isn't on this list doesn't mean that it's acceptable. Use common sense above all else. +Just because something isn't on this list doesn't mean that it's acceptable. Use common sense above all else. ## A word on Git Yes, we know that the files have a tonne of mixed Windows and Linux line endings. Attempts to fix this have been met with less than stellar success, and as such we have decided to give up caring until there comes a time when it matters.