Merge pull request jlord#24 from kiliankoe/patch-1

fixed a small typo
cloudsecuritylabs · Jan 30, 2014 · 7c95243 · 7c95243
2 parents 131a835 + a2d9a27
commit 7c95243
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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 <REMOTENAME> <BRANCHNAME>{/cyan}
 
-  --------------------------------------------------------------------
+  --------------------------------------------------------------------