Installed packages and fixed merge commits

Author: Gregg

package-lock.json

@@ -23,27 +23,16 @@ export default {
   }
 }
 </script>
-<<<<<<< HEAD
 
-=======
-
->>>>>>> master
 <style scoped>
 .icon-wrapper {
   display: inline-flex;
   align-items: center;
-<<<<<<< HEAD
   color: rgba(0, 0, 0, 0.4);
-=======
->>>>>>> master
   font-size: 1rem;
   font-weight: 600;
 }
 .icon {
-<<<<<<< HEAD
-=======
-  color: rgba(0, 0, 0, 0.4);
->>>>>>> master
   stroke: currentColor;
   stroke-width: 2;
   stroke-linecap: round;

src/components/BaseIcon.vue

@@ -3,11 +3,7 @@
     <div class="event-card -shadow">
       <span class="eyebrow">@{{ event.time }} on {{ event.date }}</span>
       <h4 class="title">{{ event.title }}</h4>
-<<<<<<< HEAD
       <BaseIcon name="users">{{ event.attendees.length }} attending</BaseIcon>
-=======
-      <BaseIcon name="users">{{ event.attendees }} attending</BaseIcon>
->>>>>>> master
     </div>
   </router-link>
 </template>