From 6513f6cfaaf06b308c438024cd07c2d6a5762bf7 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 29 Nov 2021 17:32:40 -0500
Subject: [PATCH] CSR-120: fix component test

---
 .../vehicle-banner/vehicle-banner.vue            |  2 +-
 src/layouts/component-test/component-test.vue    | 16 +---------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/common-components/vehicle-banner/vehicle-banner.vue b/src/common-components/vehicle-banner/vehicle-banner.vue
index fbf049819..9d91beb74 100644
--- a/src/common-components/vehicle-banner/vehicle-banner.vue
+++ b/src/common-components/vehicle-banner/vehicle-banner.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="vehicle_banner mb-3">
+  <div class="vehicle_banner mb-3 text-center">
     <img
       class="vehicle-image img-fluid"
       :src="vehicleImageSrc"
diff --git a/src/layouts/component-test/component-test.vue b/src/layouts/component-test/component-test.vue
index 506cd317a..2320f68e4 100644
--- a/src/layouts/component-test/component-test.vue
+++ b/src/layouts/component-test/component-test.vue
@@ -211,7 +211,6 @@
         />
       </div>
     </div>
-<<<<<<< HEAD
     <div class="row my-2">
       <div class="col">
         <alert
@@ -221,19 +220,6 @@
         v-bind:isDismissible = "false"
         />
       </div>
-=======
-    <div class="row">
-        <div class="col my-3 d-flex align-items-center">
-            <buttonPrimary buttonText="Primary" @click="testMethod" />
-        </div>
-    </div>
-    <div class="my-3">
-        <div class="select-car">
-            <div class="select-car-form">
-                <radioQuestion questionText="What year is your vehicle?" :answers="this.years" />
-            </div>
-        </div>
->>>>>>> feature/CSR-6
     </div>
     <div class="row my-4">
       <div class="col">
@@ -241,7 +227,7 @@
       </div>
     </div>
     <div class="row my-3">
-      <div class="d-flex align-items-center">
+      <div class="col">
         <vehicleBanner
           passedCarId=""
         />