Fix merge conflict.

Merge branch 'master' of https://github.com/goraw/recipes into different-oil Conflicts: cake-recipe.txt
goraw · Nov 19, 2014 · e0264d1 · e0264d1
2 parents c2db209 + cddc73c
commit e0264d1
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 olive oil
+ - 3/4 cup vegetable oil
  - 2 teaspoons vanilla extract
  - 1 cup boiling water