From 4ccfa5e3f0d547fa6b57e12b37f72e90ca69eec0 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 13 Sep 2022 15:05:00 -0400
Subject: [PATCH] Remove text-block.orig file

---
 .../text-block/text-block.vue.orig            | 41 -------------------
 1 file changed, 41 deletions(-)
 delete mode 100644 src/common-components/text-block/text-block.vue.orig

diff --git a/src/common-components/text-block/text-block.vue.orig b/src/common-components/text-block/text-block.vue.orig
deleted file mode 100644
index 33d81d43c..000000000
--- a/src/common-components/text-block/text-block.vue.orig
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <div class="text-block d-flex w-100 mt-4" :class="[justifyText, typeStyle, fontWeight]" v-html="this.TextBlockCopy"></div>
-</template>
-
-<script>
-export default {
-  name: 'textBlock',
-  props: {
-    justifyText: String,// left, right, center
-    typeStyle: String, // h1-h6, body, small, label, caption (see Figma or Confluence documentation)
-    fontWeight: String,// bold=500, default is 400
-    cmsWidgetName: String,
-  },
-  computed: {
-      TextBlockCopy(){
-        return this.getCmsContent(this.cmsWidgetName, "Text");
-      },
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-  .text-block {
-    &.left {
-      justify-content: flex-start;
-    }
-    &.right {
-      justify-content: flex-end;
-    }
-    &.center {
-      justify-content: center;
-    }
-    &.bold {
-      font-weight: 500;
-    }
-  }
-<<<<<<< HEAD
-</style>
-=======
-</style>
->>>>>>> d1bf013... fixed remaining merge conflict