v3.0.0

.npmignore

@@ -0,0 +1,7 @@
+.git
+.gitignore
+bower.json
+CHANGELOG.md
+package.json
+README.md
+screenshot.png

CHANGELOG.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ### v3.0.0
 ##### Added / Updated
 - Customized text on helper elements
@@ -14,6 +15,8 @@
 - input-model is now static (not dynamically updated), hence why we need output-model. On the plus side, you now can re-use the input model where necessary.
 - default-label is deprecated. Custom text and translations can be done using the translation attribute.
 
+=======
+>>>>>>> 2ec1448096771715822b3329e9ef566d598a8f5d
 ### v2.0.2
 ##### Added / Updated
 - Bring back CSS into bower.json.

bower.json

@@ -3,12 +3,14 @@
     "version"   : "v3.0.0",
     "main"      : [
         "isteven-multi-select.js",
-        "isteven-multi-select.css",
+        "isteven-multi-select.css"
     ],
     "ignore"    : [
         ".git",
         ".gitignore",
         "bower.json",
+        "CHANGELOG.md",
+        "package.json",
         "README.md",        
         "screenshot.png",
         "/doc"

isteven-multi-select.js

@@ -61,7 +61,6 @@ angular.module( 'isteven-multi-select', ['ng'] ).directive( 'istevenMultiSelect'
             groupProperty   : '@',
             searchProperty  : '@',  // 3.0.0 - OK
             maxHeight       : '@',            
-            lazyLoading     : '@',  // 3.0.0
 
             // callbacks
             onClear         : '&',  // 3.0.0 - OK

package.json

@@ -0,0 +1,22 @@
+{
+    "name": "isteven-angular-multiselect",
+    "version": "v2.0.2",
+    "description": "A multi select dropdown directive for AngularJS",
+    "main": [
+        "angular-multi-select.js",
+        "angular-multi-select.css"
+    ],
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/isteven/angular-multi-select.git"
+    },
+    "keywords": [
+        "angular"
+    ],
+    "author": "Ignatius Steven <isteven.github@gmail.com> (https://github.com/isteven)",
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/isteven/angular-multi-select/issues"
+    },
+    "homepage": "https://github.com/isteven/angular-multi-select"
+}