Merge branch 'master' into different-oil

Conflicts: cake-recipe.txt
dimkaatanassov · Dec 5, 2014 · 6a76c16 · 6a76c16
2 parents af0303b + 693c099
commit 6a76c16
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cake-recipe.txt b/cake-recipe.txt
@@ -7,7 +7,7 @@ Ingredients:
  - 1 teaspoon salt
  - 2 eggs
  - 1 cup milk
- - 1/2 cup canola oil
+ - 3/4 cup canola oil
  - 2 teaspoons vanilla extract
  - 1 cup boiling water