Remove text-block.orig file

src/common-components/text-block/text-block.vue.orig

@@ -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