Fixed merge errors

2014-07-20 21:36:13 +02:00
parent fc3dffad30
commit 21a2b3c36f
2 changed files with 0 additions and 264 deletions
--- a/www/protected/views/layouts/main.php
+++ b/www/protected/views/layouts/main.php
@@ -1,7 +1,5 @@
 <?php /* @var $this MSController */ ?>

-<?php Yii::app()->counter->refresh(); ?>
-
 <!DOCTYPE html>
 <!--[if lt IE 7]>
 <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->