Projects >> java-mateview >>7f7519d10d35fd2f94b33a8ea7cf9f856ee0c943

Chunk
Conflicting content
			endCaptures = Pattern.makeCapturesFromPlist(dict.getDictionary("endCaptures"));
		}
	}
<<<<<<< HEAD
}
=======
	
	public void replaceGrammarIncludes() {
		if (hasReplacedGrammarIncludes)
			return;
		Grammar ng;
		int i = 0;
		while (i < patterns.size()) {
			Pattern p = patterns.get(i);
			if (p instanceof IncludePattern) {
				if ((ng = Grammar.findByScopeName(p.name)) != null) {
					ng.initForUse();
					patterns.remove(i);
					patterns.addAll(i, ng.patterns);
					i--;
				}
			}
			i++;
		}
		hasReplacedGrammarIncludes = true;
	}

}
>>>>>>> 3d63e7d5bbd96417e1a211bc4a0f28878af5a94c
Solution content
			endCaptures = Pattern.makeCapturesFromPlist(dict.getDictionary("endCaptures"));
		}
	}
	
	public void replaceGrammarIncludes() {
		if (hasReplacedGrammarIncludes)
			return;
		Grammar ng;
		int i = 0;
		while (i < patterns.size()) {
			Pattern p = patterns.get(i);
			if (p instanceof IncludePattern) {
				if ((ng = Grammar.findByScopeName(p.name)) != null) {
					ng.initForUse();
					patterns.remove(i);
					patterns.addAll(i, ng.patterns);
					i--;
				}
			}
			i++;
		}
		hasReplacedGrammarIncludes = true;
	}

}
File
DoublePattern.java
Developer's decision
Version 2
Kind of conflict
Method declaration