resolve git conflicts

Author: edumudu

.browserslistrc

@@ -0,0 +1,3 @@
+> 1%
+last 2 versions
+not dead

.editorconfig

@@ -0,0 +1,7 @@
+[*.{js,jsx,ts,tsx,vue}]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+max_line_length = 100

babel.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+  presets: [
+    '@vue/cli-plugin-babel/preset',
+  ],
+};

tests/unit/example.spec.ts

@@ -0,0 +1,8 @@
+import { expect } from 'chai';
+import { shallowMount } from '@vue/test-utils';
+
+describe('HelloWorld.vue', () => {
+  it('renders props.msg when passed', () => {
+    //
+  });
+});