diff --git a/bower.json b/bower.json index 6278156..c68dc85 100644 --- a/bower.json +++ b/bower.json @@ -1,12 +1,20 @@ { "name": "fullcalendar", "version": "2.1.1", +<<<<<<< HEAD "description": "Full-sized drag & drop event calendar with resources", "keywords": [ "calendar", "event", "full-sized", "Resources" +======= + "description": "Full-sized drag & drop event calendar", + "keywords": [ + "calendar", + "event", + "full-sized" +>>>>>>> upstream/master ], "homepage": "http://arshaw.com/fullcalendar/", "dependencies": { @@ -35,4 +43,8 @@ "!/license.*", "!/readme.*" ] -} \ No newline at end of file +<<<<<<< HEAD +} +======= +} +>>>>>>> upstream/master diff --git a/build/tasks/generateLanguages.js b/build/tasks/generateLanguages.js index dee8510..d234b0b 100644 --- a/build/tasks/generateLanguages.js +++ b/build/tasks/generateLanguages.js @@ -208,4 +208,8 @@ module.exports = function(grunt) { } -}; \ No newline at end of file +<<<<<<< HEAD +}; +======= +}; +>>>>>>> upstream/master diff --git a/demos/agenda-views.html b/demos/agenda-views.html index 4a41578..eb2adf0 100644 --- a/demos/agenda-views.html +++ b/demos/agenda-views.html @@ -102,4 +102,4 @@