Merge branch 'master' of https://github.com/hwtzch/recipes

Conflicts:
	chili-recipe.txt

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 salt
  - 1/4 teaspoon cayenne pepper
@@ -14,7 +13,13 @@ Ingredients:
 
 Directions:
  1. Brown the ground beef in a large bot and drain off the excess fat.
+<<<<<<< HEAD
  2. Add the tomato sauce, chili powder, cumin, oregano, salt, cayenne pepper, and onion powder.
+||||||| merged common ancestors
+ 2. Add the tomato sauce, chili powder, cumin, oregano, salt, and cayenne.
+=======
+ 2. Add the tomato sauce, chili powder, oregano, salt, and cayenne.
+>>>>>>> b3aab046099e6deda171a77d45ec1a9d8a8e3967
  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.