14 lines
471 B
Plaintext
14 lines
471 B
Plaintext
<<<<<<< HEAD
|
|
<<<<<<< HEAD
|
|
<<<<<<< HEAD
|
|
d7e6838ab345d847cad4078575babed33718cf28a47b8f27d6c4be1f7f7e97a7
|
|
=======
|
|
f121c5eeefa8c5e39430715ad45c0dbadc6c8ad0
|
|
>>>>>>> 3616449 (preparando merge)
|
|
=======
|
|
bb93237b0189a4b8b1180fafac8534e65b007ad7d97889b9b241a52a4500d537
|
|
>>>>>>> 8ad9dc6 (faltan controladoras)
|
|
=======
|
|
41b9ae2cc417f11ef0d05afd64f424d30011ec3381b04e193604d3f4663cdb67
|
|
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
|