Merge branch 'master' of https://github.com/Schlogen/angular-confirm

James Kleeh · James Kleeh · commit 7b8ed27d3652 · 2015-10-26T11:05:56.000-04:00
diff --git a/angular-confirm.js b/angular-confirm.js
@@ -4,12 +4,6 @@
  * @version v1.1.2 - 2015-09-26
  * @license Apache
  */
-/*
- * angular-confirm
- * https://github.com/Schlogen/angular-confirm
- * @version v1.1.1 - 2015-09-26
- * @license Apache
- */
 angular.module('angular-confirm', ['ui.bootstrap.modal'])
   .controller('ConfirmModalController', function ($scope, $modalInstance, data) {
     $scope.data = angular.copy(data);
diff --git a/angular-confirm.min.js b/angular-confirm.min.js
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-confirm-modal",
-  "main": "angular-confirm.js",
+  "main": "angular-confirm.min.js",
   "version": "1.1.2",
   "homepage": "https://github.com/Schlogen/angular-confirm",
   "authors": [
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "angular-confirm",
   "version": "1.1.2",
   "description": "Angular Confirm Modal",
-  "main": "angular-confirm.js",
+  "main": "angular-confirm.min.js",
   "scripts": {
     "test": "gulp test-unit"
   },

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "angular-confirm-modal",`
`3`		`- "main": "angular-confirm.js",`
	`3`	`+ "main": "angular-confirm.min.js",`
`4`	`4`	`"version": "1.1.2",`
`5`	`5`	`"homepage": "https://github.com/Schlogen/angular-confirm",`
`6`	`6`	`"authors": [`