Fix merge conflicts (Ref OwlCarousel2#901)

Gruntfile.js

@@ -8,16 +8,12 @@
  */
 module.exports = function(grunt) {
 
-	if (!grunt.file.isDir('bower_components')) {
-		grunt.fail.fatal('>> Please run "bower install" before continuing.');
-	}
 	require('load-grunt-tasks')(grunt);
 
 	grunt
 		.initConfig({
 			pkg: grunt.file.readJSON('package.json'),
 			app: grunt.file.readJSON('_config.json'),
-			vendor: 'bower_components',
 			banner: '/**\n' + ' * Owl Carousel v<%= pkg.version %>\n'
 				+ ' * Copyright 2013-<%= grunt.template.today("yyyy") %> <%= pkg.author.name %>\n'
 				+ ' * Licensed under <%= pkg.license.type %> (<%= pkg.license.url %>)\n' + ' */\n',
@@ -89,7 +85,7 @@ module.exports = function(grunt) {
 				docs: {
 					options: {
 						outputStyle: 'compressed',
-						includePaths: [ '<%= app.docs.src %>/assets/scss/', 'bower_components/foundation/scss' ]
+						includePaths: [ '<%= app.docs.src %>/assets/scss/', 'node_modules/foundation-sites/scss' ]
 					},
 					files: {
 						'<%= app.docs.dest %>/assets/css/docs.theme.min.css': '<%= app.docs.src %>/assets/scss/docs.theme.scss'

bower.json

@@ -8,9 +8,5 @@
   "ignore": [],
   "dependencies": {
     "jquery": ">= 1.8.3"
-  },
-  "devDependencies": {
-    "foundation": "~5.5.2",
-    "qunit": "1.14.0"
   }
 }

package.json

@@ -16,7 +16,11 @@
     "url": "http://github.com/smashingboxes/OwlCarousel2/issues",
     "email": "[email protected]"
   },
+  "dependencies": {
+    "jquery": ">=1.8.3"
+  },
   "devDependencies": {
+    "qunitjs": "^1.18.0",
     "assemble": "~0.4.37",
     "grunt": "~0.4.5",
     "grunt-contrib-clean": "~0.6.0",
@@ -34,7 +38,8 @@
     "grunt-sass": "^1.0.0",
     "grunt-banner": "^0.4.0",
     "load-grunt-tasks": "^3.2.0",
-    "pretty": "^1.0.0"
+    "pretty": "^1.0.0",
+    "foundation-sites": "zurb/[email protected].*"
   },
   "engines": {
     "node": "~0.10.28"

test/index.html

@@ -6,10 +6,10 @@
 
 		<title>Owl Carousel 2</title>
 
-		<link rel="stylesheet" href="../bower_components/qunit/qunit/qunit.css" />
+		<link rel="stylesheet" href="../node_modules/qunitjs/qunit/qunit.css" />
 
-		<script src="../bower_components/jquery/dist/jquery.js"></script>
-		<script src="../bower_components/qunit/qunit/qunit.js"></script>
+		<script src="../node_modules/jquery/dist/jquery.js"></script>
+		<script src="../node_modules/qunitjs/qunit/qunit.js"></script>
 
 		<script src="../src/js/owl.carousel.js"></script>
 		<script src="../src/js/owl.support.js"></script>