* Controller.php merge conflict solved.

classes/korty/controller.php

@@ -34,33 +34,15 @@ public function after()
 				{
 					foreach($controller as $controller_name => $action_name)
 					{
-<<<<<<< HEAD
-<<<<<<< HEAD
-						if($this->request->controller == $controller_name AND $this->request->action == $action_name)
-						{
-=======
 						if($this->request->controller() == $controller_name AND $this->request->action() == $action_name) {
->>>>>>> 35ba21db297c94506125835337cd30bc184c85fc
-=======
-						if($this->request->controller() == $controller_name AND $this->request->action() == $action_name) {
->>>>>>> 35ba21db297c94506125835337cd30bc184c85fc
 							$ignore_autoload = TRUE;
 							break;
 						}
 					}
 				}
 				else
 				{
-<<<<<<< HEAD
-<<<<<<< HEAD
-					if($this->request->controller == $controller)
-					{
-=======
-					if($this->request->controller() == $controller) {
->>>>>>> 35ba21db297c94506125835337cd30bc184c85fc
-=======
 					if($this->request->controller() == $controller) {
->>>>>>> 35ba21db297c94506125835337cd30bc184c85fc
 						$ignore_autoload = TRUE;
 						break;
 					}
@@ -77,15 +59,7 @@ public function after()
 			if( ! $ignore_autoload)
 			{
 				// The layout organization format
-<<<<<<< HEAD
-<<<<<<< HEAD
-				$template_file = $this->request->controller.'/'.$this->request->action.'.tpl';
-=======
-				$template = $this->request->controller().'/'.$this->request->action().'.tpl';
->>>>>>> 35ba21db297c94506125835337cd30bc184c85fc
-=======
-				$template = $this->request->controller().'/'.$this->request->action().'.tpl';
->>>>>>> 35ba21db297c94506125835337cd30bc184c85fc
+				$template_file = $this->request->controller().'/'.$this->request->action().'.tpl';
 
 				// Load only if template exists
 				if($this->korty->templateExists($template_file))
@@ -99,16 +73,8 @@ public function after()
 				// If some template was loaded before by korty::render(), we don't need to warn about missing template =]
 				if(!isset($this->request->korty_rendered))
 				{
-<<<<<<< HEAD
-<<<<<<< HEAD
-					$message = "Template for {$this->request->controller}#{$this->request->action} not found!\n"
-					         . "Did you forgot to create the {$template_file} file?";
-=======
-=======
->>>>>>> 35ba21db297c94506125835337cd30bc184c85fc
 					$message = "Template for {$this->request->controller()}#{$this->request->action()} not found!\n"
-					         . "Did you forgot to create the {$template} file?";
->>>>>>> 35ba21db297c94506125835337cd30bc184c85fc
+					         . "Did you forgot to create the {$template_file} file?";
 
 					throw new Kohana_Exception($message);
 				}