14 lines
471 B
Plaintext
14 lines
471 B
Plaintext
<<<<<<< HEAD
|
|
<<<<<<< HEAD
|
|
<<<<<<< HEAD
|
|
5433dac5452fa5db31338aa45759172473b740a8027bf6a5b338d0bd8e08a305
|
|
=======
|
|
a90b7be7f25b3be585c8c3eda0cd50696de263dc
|
|
>>>>>>> 3616449 (preparando merge)
|
|
=======
|
|
244ec86832aa35c5b9c5e6ebfc71403d927ad498ea5d0b2c0c49514ce34338d6
|
|
>>>>>>> 8ad9dc6 (faltan controladoras)
|
|
=======
|
|
14dd92a1eca361463bdac6313faec43ff2400fcede9eb6798b98887050929b0b
|
|
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
|