resolviendo conflicto para rebase
authorCrawKatt <man849916@gmail.com>
Wed, 8 Mar 2023 21:32:31 +0000 (18:32 -0300)
committerCrawKatt <man849916@gmail.com>
Wed, 8 Mar 2023 21:32:31 +0000 (18:32 -0300)
commite563185a16498934aa0fb6f0bc148556612c4ad9
tree9b22d1f3d3e13c22cff41a8978dbd26e98514880
parent00ff26b68100fe51c33f7e712478745ba1d8505c
resolviendo conflicto para rebase
.gitignore
themes/droda/assets/css/main.css
themes/droda/layouts/partials/navbar.html