From a2d9a272b3e1acb32d6a0e665edcfe8388026a6e Mon Sep 17 00:00:00 2001 From: Kilian Koeltzsch Date: Thu, 30 Jan 2014 01:13:10 +0100 Subject: [PATCH] fixed a small typo :) --- problems/merge_tada/problem.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/problems/merge_tada/problem.txt b/problems/merge_tada/problem.txt index 879e6dedad..4fd46cbe6f 100644 --- a/problems/merge_tada/problem.txt +++ b/problems/merge_tada/problem.txt @@ -2,7 +2,7 @@ -------------------------------------------------------------------- - Your pull request is being mereged! But meanwhile, since you + Your pull request is being merged! But meanwhile, since you know that you definitely want those updates in your forked version, and your branch is in good working order, merge it into the main, branch on your forked repository, in this case, `gh-pages`. @@ -72,4 +72,4 @@ $ git pull {/cyan} - -------------------------------------------------------------------- \ No newline at end of file + --------------------------------------------------------------------