From 02ff535f6ef6a7beb868164528f3ff57e1b3a3c1 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 13 Sep 2022 10:33:54 -0400
Subject: [PATCH] fixed text-block build issues

---
 src/common-components/text-block/text-block.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/common-components/text-block/text-block.vue b/src/common-components/text-block/text-block.vue
index 53cf8ce87..aee7fc5c6 100644
--- a/src/common-components/text-block/text-block.vue
+++ b/src/common-components/text-block/text-block.vue
@@ -34,8 +34,4 @@ export default {
       font-weight: 500;
     }
   }
-<<<<<<< HEAD
 </style>
-=======
-</style>
->>>>>>> release/2022.09.29