Fixed site album in extended footer to have render correctly

innovatesac · May 17, 2016 · 735de3f · 735de3f
2 parents 3b3d21a + f2e25f9
commit 735de3f
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/_includes/extended_footer.html b/_includes/extended_footer.html
@@ -1,19 +1,28 @@
 <section class="site-album">
   <div class="album-row">
-    <img src="img/home/usds-logo-written-in-marker.jpg" alt="the-usds-logo-written-in-marker" />
-    <img src="img/home/usds-staff-meeting.jpg" alt="the-usds-team-staff-meeting" />
-    <img src="img/home/usds-emoji-logo-on-whiteboard.jpg" alt="the-usds-emoji-logo-written-on-a-whiteboard" />
-    <img src="img/home/usds-talent-team-selfie-at-white-house.jpg" alt="the-usds-talent-team-posing-for-a-selfie-at-white-house" />
-    <img src="img/home/usds-meeting-in-progress-cardboard-sign.jpg" alt="a-usds-meeting-in-progress-cardboard-sign" />
-    <img src="img/home/engineer-coding-infront-of-fireplace.jpg" alt="an-engineer-coding-infront-of-a-fireplace" />
+    <img src="img/home/usds-logo-written-in-marker.jpg" alt="the usds logo written in marker" />
+    <img src="img/home/usds-staff-meeting.jpg" alt="a picture of the usds team at a staff meeting" />
+    <img src="img/home/usds-emoji-logo-on-whiteboard.jpg" alt="the usds emoji logo written on a whiteboard" />
+    <img src="img/home/usds-talent-team-selfie-at-white-house.jpg" alt="the usds talent team taking a selfie at the white house" />
+    <img src="img/home/usds-meeting-in-progress-cardboard-sign.jpg" alt="a cardboard sign that says meeting in progress" />
+    <img src="img/home/engineer-coding-infront-of-fireplace.jpg" alt="a usds engineer working infront of a fireplace" />
   </div>
   <div class="album-row">
+<<<<<<< HEAD
     <img src="img/home/defense-digital-service-team-photo.jpg" alt="the-defense-digital-service-team-photo" />
     <img src="img/home/usds-team-at-dhs-team-photo.jpg" alt="the-usds-team-at-dhs-team-photo" />
     <img src="img/home/usa-jacket-hanging-on-coatrack.jpg" alt="a-usa-embroidered-jacket-hanging-on-a-coatrack" />
     <img src="img/home/team-working-in-usds-hq.jpg" alt="the-usds-team-working-in-the-usds-hq" />
     <img src="img/home/hand-holding-a-usds-sticker.jpg" alt="A hand holding a USDS sticker" />
     <img src="img/home/usds-team-laughing-in-meeting.jpg" alt="the-usds-team-laughing-in-a-meeting" />
+=======
+    <img src="img/home/defense-digital-service-team-photo.jpg" alt="the defense digital service posing for a team photo" />
+    <img src="img/home/usds-team-at-dhs-team-photo.jpg" alt="the usds team at dhs posing for a team photo" />
+    <img src="img/home/usa-jacket-hanging-on-coatrack.jpg" alt="a usa embroidered jacket hanging on a coat rack" />
+    <img src="img/home/team-working-in-usds-hq.jpg" alt="the usds team working in the HQ office" />
+    <img src="img/home/a-hand-holding-a-usds-sticker.jpg" alt="a hand holding a usds sticker" />
+    <img src="img/home/usds-team-laughing-in-meeting.jpg" alt="members of the usds team laughing in a meeting" />
+>>>>>>> f2e25f904048927655c7bdbcef45f0385f2b06d9
   </div>
 </section>