diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2013-01-23 11:32:14 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2013-01-23 11:32:14 +0100 |
| commit | fe56e4df7d6e2e9f37c378acbf0327c0ed694eb2 (patch) | |
| tree | 7402d7704bba1d34853f7ad9947f9804a58d1b87 /core/templates/layout.base.php | |
| parent | c8bbbb48d3214d3ce141110aebcd59577d9e5c40 (diff) | |
| download | nextcloud-server-fe56e4df7d6e2e9f37c378acbf0327c0ed694eb2.tar.gz nextcloud-server-fe56e4df7d6e2e9f37c378acbf0327c0ed694eb2.zip | |
Fix merge conflict
Diffstat (limited to 'core/templates/layout.base.php')
| -rw-r--r-- | core/templates/layout.base.php | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 08083a2924a..47fb75612cf 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -7,15 +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']; ?>'; - </script> ->>>>>>> master <?php foreach ($_['jsfiles'] as $jsfile): ?> <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> <?php endforeach; ?> |