delect conflict

package-lock.json

@@ -6058,7 +6058,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -6473,7 +6474,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -6529,6 +6531,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -6572,12 +6575,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },

src/components/Table.vue

@@ -16,7 +16,6 @@
         </ul>
       </li>
     </ul>
-    <div>{{formateddata}}</div>
   </div>
 
 </template>

tsconfig.json

@@ -11,21 +11,20 @@
     "allowSyntheticDefaultImports": true,
     "sourceMap": true,
     "baseUrl": ".",
-    "types": [
-      "node",
-      "jest"
-    ],
+    "types": ["node", "jest"],
     "paths": {
-      "@/*": [
-        "src/*"
-      ]
+      "@/*": ["src/*"]
     },
+<<<<<<< HEAD
     "lib": [
       "esnext",
       "dom",
       "dom.iterable",
       "scripthost"
     ]
+=======
+    "lib": ["esnext", "dom", "dom.iterable", "scripthost"]
+>>>>>>> 4bbd0e33b7efd26db4e8ea98b8b8c281f9f1f6f6
   },
   "include": [
     "src/**/*.ts",
@@ -34,7 +33,5 @@
     "tests/**/*.ts",
     "tests/**/*.tsx"
   ],
-  "exclude": [
-    "node_modules"
-  ]
+  "exclude": ["node_modules"]
 }