Created
August 16, 2011 16:11
-
-
Save seeRead/1149446 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<<<<<<< HEAD | |
<!-- Yii seems to be including jquery automagically - we don't need this line | |
<script src="<?php echo Yii::app()->request->baseUrl; ?>/js/jquery.js" type="text/javascript"></script> | |
--> | |
<script src="<?php echo Yii::app()->request->baseUrl; ?>/js/jquery.ui.min.js" type="text/javascript"></script> | |
<script src="<?php echo Yii::app()->request->baseUrl; ?>/js/jquery.tag.it.js" type="text/javascript"></script> | |
<script src="<?php echo Yii::app()->request->baseUrl; ?>/js/jquery.tools.js" type="text/javascript"></script> | |
<script src="<?php echo Yii::app()->request->baseUrl; ?>/js/jquery.select.box.js" type="text/javascript"></script> | |
======= | |
<script src="<?php echo Yii::app()->request->baseUrl; ?>/js/admin.scripts.min.js" type="text/javascript"></script> | |
<script src="<?php echo Yii::app()->request->baseUrl; ?>/js/jquery-ui-timepicker-addon.js" type="text/javascript"></script> | |
>>>>>>> master |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment