fixed text-block build issues

2022-09-13 10:33:54 -04:00 · 2022-09-13 10:33:54 -04:00 · 02ff535f6e
commit 02ff535f6e
parent 14091a172e
1 changed files with 0 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,4 @@ export default {
      font-weight: 500;
    }
  }
-<<<<<<< HEAD
 </style>
-=======
-</style>
->>>>>>> release/2022.09.29