resolviendo conflicto para rebase
authorCrawKatt <man849916@gmail.com>
Wed, 8 Mar 2023 21:33:51 +0000 (18:33 -0300)
committerCrawKatt <man849916@gmail.com>
Wed, 8 Mar 2023 21:33:51 +0000 (18:33 -0300)
commit10ee5265e1786a688ef20c9b171c893837b36b59
tree6ec74b5aa0048cf3ac86ed279b8a058274022bb6
parente563185a16498934aa0fb6f0bc148556612c4ad9
resolviendo conflicto para rebase
.gitignore