fix merge conflict

This commit is contained in:
nightwing 2013-08-22 15:29:17 +04:00
commit c3491f4855

View file

@ -359,9 +359,6 @@ var Mode = function() {
this.getCompletions = function(state, session, pos, prefix) {
var keywords = this.$keywordList || [];
keywords = keywords.filter(function(w) {
return w.lastIndexOf(prefix, 0) == 0;
});
return keywords.map(function(word) {
return {
name: word,