Merge fixing

Author: ManukMinasyan

.github/FUNDING.yml

@@ -6,7 +6,7 @@ open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
+liberapay: manuk
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
 custom: # Replace with a single custom sponsorship URL

README.md

@@ -2,8 +2,8 @@
 
 [![Build Status](https://travis-ci.org/ManukMinasyan/vue-functional-calendar.svg?branch=master)](https://travis-ci.org/ManukMinasyan/vue-functional-calendar)
 [![Version](https://img.shields.io/npm/v/vue-functional-calendar.svg)](https://www.npmjs.com/package/vue-functional-calendar)
-[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.md)
-[![Downloads](https://img.shields.io/npm/dm/vue-functional-calendar.svg)](https://www.npmjs.com/package/vue-functional-calendar)
+[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)
+[![Downloads](https://img.shields.io/npm/dt/vue-functional-calendar.svg)](https://www.npmjs.com/package/vue-functional-calendar)
 ![gzip size](https://img.shields.io/badge/gzip%20size-5.73%20kB-44cc11.svg)
 ___
 
@@ -47,7 +47,7 @@ ___
 // Introduced in vue file
 import FunctionalCalendar from 'vue-functional-calendar';
 Vue.use(FunctionalCalendar, {
-    dayNames: ['Moa', 'Tu', 'We', 'Th', 'Fr', 'Sa', 'Su']
+    dayNames: ['Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa', 'Su']
 });
 ````
 

src/main.js

@@ -1,12 +1,21 @@
+<<<<<<< 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({
-    el: '#app',
-    template: '<Demo/>',
-    components: {Demo}
+  el: "#app",
+  template: "<Demo/>",
+  components: { Demo }
 });