Fixed main.js conflict

Author: ManukMinasyan

package.json

@@ -6,7 +6,7 @@
   },
   "name": "vue-functional-calendar",
   "description": "Lightweight, high-performance calendar component based on Vue.js",
-  "version": "2.6.8",
+  "version": "2.6.9",
   "license": "MIT",
   "repository": {
     "type": "git",

src/main.js

@@ -1,17 +1,9 @@
-<<<<<<< HEAD
-import Vue from 'vue';
-import FunctionalCalendar from '../index';
-import Demo from './Demo';
-
-Vue.use(FunctionalCalendar, {dayNames: ['Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa', 'Su']});
-=======
 import Vue from "vue";
 import FunctionalCalendar from "../index";
 import Demo from "./Demo";
 Vue.use(FunctionalCalendar, {
   dayNames: ["Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"]
 });
->>>>>>> c3d947c02d49b17d50f1fc268c051c365bb5be7e
 Vue.config.productionTip = false;
 
 new Vue({