Skip to content
Permalink
Browse files

Merge branch 't/13668'

  • Loading branch information...
Reinmar committed Aug 31, 2015
2 parents 6bfef0c + 6cbbd1d commit 1213ebe127cddb128e817c3497d72515fec8fcae
Showing with 2 additions and 7 deletions.
  1. +0 −1 dev/tasks/plugin.js
  2. +2 −4 plugins/find/dialogs/find.js
  3. +0 −2 plugins/magicline/plugin.js
@@ -248,7 +248,6 @@ module.exports = function( grunt ) {
} catch ( e ) {
return false;
}
return false;
}

function addPluginDirToGitExclude( pluginDir ) {
@@ -370,14 +370,12 @@
return KMP_MATCHED;
}
return KMP_ADVANCED;
} else if ( !this._.state )
} else if ( !this._.state ) {
return KMP_NOMATCH;
else {
} else {
this._.state = this._.overlap[this._.state];
}
}

return null;
},

reset: function() {
@@ -494,8 +494,6 @@
return limit;
else
return null;

return trigger;
} else {
return null;
}

0 comments on commit 1213ebe

Please sign in to comment.
You can’t perform that action at this time.