fix merge conflict.

2011-06-13 04:38:24 -04:00
parent a086a21b5f
commit 28b5a457ce
1 changed files with 0 additions and 7 deletions
@@ -307,13 +307,6 @@ class Mustache {
 			$offset   = $matches[0][1];
 			$type     = $matches['type'][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);