From 90b205232ab30ca61936af28b77d34fb701935b9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 20 Jul 2013 10:56:34 +0200
Subject: [PATCH] fix merge error

clipboard was included twice
---
 views/bootstrap/class.ViewFolder.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index b33a2b7dd..f482654ac 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -122,8 +122,6 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 				} else {
 					$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=1\"><i class=\"icon-plus-sign\"></i></a>", true);
 				}
-				if ($enableClipboard) $this->printClipboard($this->params['session']->getClipboard());
-				echo "</div>\n";
 			}
 		}