setting changed

tests/unit/HelloWorld.spec.ts

@@ -3,12 +3,7 @@ import HelloWorld from "@/components/HelloWorld.vue";
 
 describe("HelloWorld.vue", () => {
   it("renders props.msg when passed", () => {
-<<<<<<< HEAD
-    const msg: string = "new message";
-    // tslint:disable-next-line:typedef
-=======
     const msg = "new message";
->>>>>>> dev-mq
     const wrapper = shallowMount(HelloWorld, {
       propsData: { msg }
     });