<!DOCTYPE html> <html> <head> <meta charset="utf-8" /> <<<<<<< HEAD <title><?php echo CApp::showTitle(); ?> </title> <?php echo CApp::linkCss(TEMPLATE_PATH . "css/style.css"); ?> ======= <title></title> <?php echo CMain::linkCss(TEMPLATE_PATH . "css/style.css"); ?> >>>>>>> ac79de2de9019914f8288aba14b731be14e8b101 </head> <body>
<!DOCTYPE html> <html> <head> <meta charset="utf-8" /> <title>MVC-generator</title> <?php echo CApp::linkCss("/engine/protected/core/gmvc-core/template/css/style.css"); ?> <?php echo CApp::linkGoogleJQuery(); ?> <?php echo CApp::linkScriptJS("/engine/protected/core/gmvc-core/template/js/script.js"); ?> </head> <body>