Framework/Mustache
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix merge conflict.

Browse Source
This commit is contained in:
Justin Hileman
2011-06-13 04:38:24 -04:00
parent a086a21b5f
commit 28b5a457ce
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mustache.php
-7
View File
@@ -308,13 +308,6 @@ class Mustache {
$type = $matches['type'][0]; $type = $matches['type'][0];
$tag_name = trim($matches['tag_name'][0]); $tag_name = trim($matches['tag_name'][0]);
if (isset($matches['delims'][0])) {
list($otag, $ctag) = explode(' ', $matches['delims'][0]);
$regEx = $this->_prepareSectionRegEx($otag, $ctag);
$search_offset = $offset + strlen($match);
continue;
}
$search_offset = $offset + strlen($match); $search_offset = $offset + strlen($match);
switch ($type) { switch ($type) {