diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2013-01-23 11:33:25 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2013-01-23 11:33:25 +0100 |
| commit | 846971ec11b74c92e58ada6ed8977b6b9871df7d (patch) | |
| tree | a2c2ade0e6f346a2174b5d02d36be6f8c94ac32b /core | |
| parent | fe56e4df7d6e2e9f37c378acbf0327c0ed694eb2 (diff) | |
| download | nextcloud-server-846971ec11b74c92e58ada6ed8977b6b9871df7d.tar.gz nextcloud-server-846971ec11b74c92e58ada6ed8977b6b9871df7d.zip | |
Fix merge conflict
Diffstat (limited to 'core')
| -rw-r--r-- | core/templates/layout.guest.php | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 7f33d539658..499d49e445d 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -7,19 +7,7 @@ <?php foreach($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" /> <?php endforeach; ?> -<<<<<<< HEAD <script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('js_config');?>"></script> -======= - <script type="text/javascript"> - var oc_debug = <?php echo (defined('DEBUG') && DEBUG) ? 'true' : 'false'; ?>; - var oc_webroot = '<?php echo OC::$WEBROOT; ?>'; - var oc_requesttoken = '<?php echo $_['requesttoken']; ?>'; - var datepickerFormatDate = <?php echo json_encode($l->l('jsdate', 'jsdate')) ?>; - var dayNames = <?php echo json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))) ?>; - var monthNames = <?php echo json_encode(array((string)$l->t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))) ?>; - var firstDay = <?php echo json_encode($l->l('firstday', 'firstday')) ?>; - </script> ->>>>>>> master <?php foreach($_['jsfiles'] as $jsfile): ?> <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> <?php endforeach; ?> |