Permalink
Browse files

Merge remote-tracking branch 'origin' into patch-block

Conflicts:
	lib/compiler.js
	test/cases/mixin.blocks.jade
  • Loading branch information...
chowey committed Apr 26, 2012
2 parents fd75320 + 96bff33 commit 18638bf54f0be96c6985344f16a5dd36aea9706f
Showing with 1 addition and 0 deletions.
  1. +1 −0 lib/lexer.js
View
@@ -304,6 +304,7 @@ Lexer.prototype = {
var mode = captures[1] || 'replace'
, name = captures[2]
, tok = this.tok('block', name);
+
tok.mode = mode;
return tok;
}

0 comments on commit 18638bf

Please sign in to comment.