diff --git a/_includes/extended_footer.html b/_includes/extended_footer.html index 9db88c22..85579e32 100644 --- a/_includes/extended_footer.html +++ b/_includes/extended_footer.html @@ -1,19 +1,28 @@
- the-usds-logo-written-in-marker - the-usds-team-staff-meeting - the-usds-emoji-logo-written-on-a-whiteboard - the-usds-talent-team-posing-for-a-selfie-at-white-house - a-usds-meeting-in-progress-cardboard-sign - an-engineer-coding-infront-of-a-fireplace + the usds logo written in marker + a picture of the usds team at a staff meeting + the usds emoji logo written on a whiteboard + the usds talent team taking a selfie at the white house + a cardboard sign that says meeting in progress + a usds engineer working infront of a fireplace
+<<<<<<< HEAD the-defense-digital-service-team-photo the-usds-team-at-dhs-team-photo a-usa-embroidered-jacket-hanging-on-a-coatrack the-usds-team-working-in-the-usds-hq A hand holding a USDS sticker the-usds-team-laughing-in-a-meeting +======= + the defense digital service posing for a team photo + the usds team at dhs posing for a team photo + a usa embroidered jacket hanging on a coat rack + the usds team working in the HQ office + a hand holding a usds sticker + members of the usds team laughing in a meeting +>>>>>>> f2e25f904048927655c7bdbcef45f0385f2b06d9