Merge remote-tracking branch 'origin/master' with local master branch

Conflicts: chili-recipe.txt
batagope · Dec 17, 2014 · 7cd71e8 · 7cd71e8
2 parents 2bb1896 + 8af0a36
commit 7cd71e8
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/chili-recipe.txt b/chili-recipe.txt
@@ -3,7 +3,6 @@ Ingredients:
  - 2 cloves garlic, chopped
  - One 8-ounce can tomato sauce
  - 2 tablespoons chili powder
- - 1 teaspoon ground cumin
  - 1 teaspoon ground oregano
  - 1 teaspoon celery
  - 1 teaspoon salt
@@ -14,7 +13,7 @@ Ingredients:
 
 Directions:
  1. Brown the ground beef in a large bot and drain off the excess fat.
- 2. Add the tomato sauce, chili powder, cumin, oregano, celery, salt, and cayenne.
+ 2. Add the tomato sauce, chili powder, oregano, salt, celery and cayenne.
  3. Stir, then cover and simmer over low heat for one hour.
  4. Mix the corn flour and 1/2 cup water in a small bowl.  Add to chili.
  5. Add the beans and simmer for 10 more minutes.