zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-03 16:32:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge resolution

Browse source
This commit is contained in:
CocoByte 2024-12-31 16:35:42 -07:00
parent 6ffe8b709d
commit 705ed34ea4
No known key found for this signature in database
GPG key ID: BBFAA2526384C97F
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/registrar/templates/base.html
View file

@ -113,11 +113,7 @@
</button>
</div>
</header>
<<<<<<< Updated upstream
<div class="usa-banner__content usa-accordion__content padding-x--widescreen margin-x-0" id="gov-banner-default">
=======
<div class="usa-banner__content usa-accordion__content padding-left--widescreen" id="gov-banner-default">
>>>>>>> Stashed changes
<div class="grid-row grid-gap-lg">
<div class="usa-banner__guidance tablet:grid-col-6">
<img class="usa-banner__icon usa-media-block__img" src="{% static 'img/icon-dot-gov.svg' %}" role="img"