merge conflicts

This commit is contained in:
psychobunny
2013-11-28 17:16:27 -05:00

View File

@@ -336,7 +336,7 @@
checkConditional(namespace + d, data[d]);
checkConditional('!' + namespace + d, !data[d]);
if (blockInfo) {
checkConditional('@first', blockInfo.iterator === 0);
checkConditional('@last', blockInfo.iterator === blockInfo.total);