From 6b66c74e074e746010fc8fc335875c217e951d87 Mon Sep 17 00:00:00 2001 From: WrinklyNinja Date: Sun, 15 Sep 2013 10:47:00 -0700 Subject: [PATCH] Bah, typo. --- New-Members-Getting-Started.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/New-Members-Getting-Started.md b/New-Members-Getting-Started.md index ecee84c..4e41670 100644 --- a/New-Members-Getting-Started.md +++ b/New-Members-Getting-Started.md @@ -102,7 +102,7 @@ This line has been added by you. This is the last line of the file. ``` -You could decide to keep both lines one after another, in which you would edit the file so that it becomes: +You could decide to keep both lines one after another, in which case you would edit the file so that it becomes: ```markdown This file is to be used to demonstrate conflict resolution.