Merge branch 'cmcavoy-choco-taco-typo-fix'

AresCeng · Feb 10, 2015 · 8d10df3 · 8d10df3
2 parents a44efcb + b9f9588
commit 8d10df3
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/like_tacos/choco_taco.md b/like_tacos/choco_taco.md
@@ -1,7 +1,11 @@
 Choco Taco
 ==============
 
+<<<<<<< HEAD
 A dessert taco, the [Choco Taco](http://en.wikipedia.org/wiki/Choco_Taco) is more easily purchased than made, but, if you're up to it, a homemade Choco Taco is pretty fantastic.
+=======
+A dessert taco, the [Choco Taco](http://en.wikipedia.org/wiki/Choco_Taco) is more easily purchased than made, but if you're up to it a homemade Choco Taco is pretty fantastic.
+>>>>>>> 43840d0a18590f20839e0f137a8793337b48a2ec
 
 ## Waffle Taco Shell