refranes.csv

Jalex-Yestera · Jalex-Yestera · commit 62506c026f9e · 2020-09-29T19:18:22.000+02:00
diff --git a/README.md b/README.md
@@ -1,6 +1,13 @@
 # crews_challenge_MCJ
+<<<<<<< HEAD
 Desafio de tripulaciones The Bridge Jun-20
 
 
 
+=======
+Desafío de tripulaciones The Bridge Jun-20
+
+Enlace a Trello
+https://trello.com/b/VWwlqfm0/desafio-detripulaciones
+>>>>>>> 9fdeb6d0f4ec7d04ad948261834f0a86ee0123b4
 
