From d84d8f71082ba17a9f37f86600a71d20e2481772 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <developer@georgehrke.com>
Date: Tue, 30 Jul 2013 12:35:39 +0200
Subject: [PATCH] fix merge conflicts

---
 lib/template/functions.php | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/lib/template/functions.php b/lib/template/functions.php
index 842f28c90e0..a892e310362 100644
--- a/lib/template/functions.php
+++ b/lib/template/functions.php
@@ -47,22 +47,6 @@ function image_path( $app, $image ) {
 	return OC_Helper::imagePath( $app, $image );
 }
 
-/**
- * @brief make preview_icon available as a simple function
- * Returns the path to the preview of the image.
- * @param $path path of file
- * @returns link to the preview
- *
- * For further information have a look at OC_Helper::previewIcon
- */
-function preview_icon( $path ) {
-	return OC_Helper::previewIcon( $path );
-}
-
-function publicPreview_icon ( $path, $token ) {
-	return OC_Helper::publicPreviewIcon( $path, $token );
-}
-
 /**
  * @brief make OC_Helper::mimetypeIcon available as a simple function
  * @param string $mimetype mimetype
@@ -87,7 +71,7 @@ function preview_icon( $path ) {
 }
 
 function publicPreview_icon ( $path, $token ) {
-	return OC_Helper::publicPreview_icon( $path, $token );
+	return OC_Helper::publicPreviewIcon( $path, $token );
 }
 
 /**