Merge pull request #732 from Safelite/feature/buildfix20220913

fixed text-block build issues
2022-09-13 10:59:51 -04:00 · 2022-09-13 10:59:51 -04:00 · 325a0e24c3
commit 325a0e24c3
parent 14091a172e bdc9f176b5
1 changed files with 1 additions and 4 deletions
--- a/src/common-components/text-block/text-block.vue
+++ b/src/common-components/text-block/text-block.vue
@ -34,8 +34,5 @@ export default {
      font-weight: 500;
    }
  }
-<<<<<<< HEAD
+  
 </style>
-=======
-</style>
->>>>>>> release/2022.09.29