7 Commits

Author	SHA1	Message	Date
Christian	cfbc1ccc6b	conflictos target	2020-09-28 14:06:11 -05:00
Christian	d7b11e1732	errores target	2020-09-28 13:57:09 -05:00
Christian	9fb9e5da61	errores con target	2020-09-28 13:56:14 -05:00
james	ac6cc7c9ec	Agendamientos	2020-09-28 13:09:26 -05:00
james	423ad06d8d	Agendamientos	2020-09-28 13:04:26 -05:00
Christian	28a8333a92	merge problem	2020-09-03 09:49:50 -05:00
Christian	636b8a4a49	error IOException	2020-08-03 09:09:56 -05:00