merge conflicts

12 years ago · 85aa587749
parent 48e36e3c31 0b6d018f8d
commit 85aa587749
1 changed files with 1 additions and 1 deletions
--- a/public/src/templates.js
+++ b/public/src/templates.js
@ -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);