From fe56e4df7d6e2e9f37c378acbf0327c0ed694eb2 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Wed, 23 Jan 2013 11:32:14 +0100
Subject: [PATCH] Fix merge conflict
---
core/templates/layout.base.php | 8 --------
1 file changed, 8 deletions(-)
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 08083a2924..47fb75612c 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; ?>
--
GitLab