From 977f28c30cbc3e564a391342c0e8082b0487b861 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Jun 2017 16:26:01 +0200
Subject: [PATCH] fix merge errors

---
 views/bootstrap/class.AdminTools.php | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/views/bootstrap/class.AdminTools.php b/views/bootstrap/class.AdminTools.php
index 906c32869..fe62004c1 100644
--- a/views/bootstrap/class.AdminTools.php
+++ b/views/bootstrap/class.AdminTools.php
@@ -86,11 +86,8 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 <?php } ?>
 <?php if($accessop->check_view_access('AttributeMgr')) { ?>
 		<a href="../out/out.AttributeMgr.php" class="span3 btn btn-medium"><i class="icon-tags"></i><br /><?php echo getMLText("global_attributedefinitions")?></a>
-<<<<<<< HEAD
 <?php } ?>
-=======
 		<?php echo $this->callHook('endOfRow', 3); ?>
->>>>>>> seeddms-5.1.x
 	</div>
 <?php
 	if($this->params['workflowmode'] == 'advanced') {
@@ -104,11 +101,8 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 <?php } ?>
 <?php if($accessop->check_view_access('WorkflowActionsMgr')) { ?>
 		<a href="../out/out.WorkflowActionsMgr.php" class="span3 btn btn-medium"><i class="icon-bolt"></i><br /><?php echo getMLText("global_workflow_actions"); ?></a>
-<<<<<<< HEAD
 <?php } ?>
-=======
 		<?php echo $this->callHook('endOfRow', 4); ?>
->>>>>>> seeddms-5.1.x
 	</div>
 <?php
 		}
@@ -123,11 +117,8 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 <?php } ?>
 <?php if($accessop->check_view_access('IndexInfo')) { ?>
 		<a href="../out/out.IndexInfo.php" class="span3 btn btn-medium"><i class="icon-info-sign"></i><br /><?php echo getMLText("fulltext_info")?></a>
-<<<<<<< HEAD
 <?php } ?>
-=======
 		<?php echo $this->callHook('endOfRow', 5); ?>
->>>>>>> seeddms-5.1.x
 	</div>
 <?php
 		}
@@ -144,11 +135,8 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 <?php } ?>
 <?php if($accessop->check_view_access('Timeline')) { ?>
 		<a href="../out/out.Timeline.php" class="span3 btn btn-medium"><i class="icon-time"></i><br /><?php echo getMLText("timeline")?></a>
-<<<<<<< HEAD
 <?php } ?>
-=======
 		<?php echo $this->callHook('endOfRow', 6); ?>
->>>>>>> seeddms-5.1.x
 	</div>
 	<div class="row-fluid">
 <?php if($accessop->check_view_access('Settings')) { ?>
@@ -159,11 +147,8 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 <?php } ?>
 <?php if($accessop->check_view_access('Info')) { ?>
 		<a href="../out/out.Info.php" class="span3 btn btn-medium"><i class="icon-info-sign"></i><br /><?php echo getMLText("version_info")?></a>
-<<<<<<< HEAD
 <?php } ?>
-=======
 		<?php echo $this->callHook('endOfRow', 7); ?>
->>>>>>> seeddms-5.1.x
 	</div>
 	<?php echo $this->callHook('afterRows'); ?>
 	</div>