Fix typo in conventions.md

2018-03-06 20:01:09 -05:00 · 2018-03-06 20:01:09 -05:00 · c2560d523f
parent bad6063311
commit c2560d523f
1 changed files with 1 additions and 1 deletions
--- a/src/conventions.md
+++ b/src/conventions.md
@ -132,7 +132,7 @@ we do not currently run rustfmt all the time, that can introduce a lot
 of noise into your commit. Please isolate that into its own
 commit. This also makes rebases a lot less painful, since rustfmt
 tends to cause a lot of merge conflicts, and having those isolated
-into their own commit makes htem easier to resolve.
+into their own commit makes them easier to resolve.

 **No merges.** We do not allow merge commits into our history, other
 than those by bors. If you get a merge conflict, rebase instead via a