Update app.php

PurpleBabar · Mar 23, 2015 · 934a00d · 934a00d
1 parent bda4052
commit 934a00d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/app.php b/app.php
@@ -69,11 +69,7 @@
 	}elseif (isset($route['template'])) {
 
 		$twiger = new Twiger( array_merge($constants, $route['params']) );
-<<<<<<< HEAD
 		$twiger->addFunctions(array($assets, $path));
-=======
-		$twiger->addFunction($assets);
->>>>>>> origin/master
 		$twiger->render($route['template'].'.html.twig', $route['route_params'] );
 
 	}