From: Gunnar Wolf <gwolf@gwolf.org>
Date: Tue, 24 Oct 2017 17:30:11 +0000 (-0500)
Subject: Resuelvo conflicto
X-Git-Tag: es-printed~703
X-Git-Url: https://pere.pagekite.me/gitweb/text-madewithcc.git/commitdiff_plain/a9f028c43e58b1214c256a0832743ea0b1504b10?hp=a9f028c43e58b1214c256a0832743ea0b1504b10

Resuelvo conflicto
---