From 440815a9c693331b5aeadfb77552e1ed4fad9fb4 Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Mon, 29 Aug 2016 21:55:31 +0200
Subject: [PATCH] fix conflict

---
 filemanager/inc/class.filemanager_ui.inc.php | 105 -------------------
 1 file changed, 105 deletions(-)

diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index afa2240878..611a285346 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -1456,109 +1456,4 @@ class filemanager_ui
 		}
 		return $mode;
 	}
-<<<<<<< HEAD
-=======
-
-	/**
-	 * Editor for odf files
-	 *
-	 * @param array $content
-	 */
-	function editor($content=null)
-	{
-		$tmpl = new Etemplate('filemanager.editor');
-		$file_path = $_GET['path'];
-		$paths = explode('/webdav.php', $file_path);
-		// Include css files used by wodocollabeditor
-		Api\Framework::includeCSS('/api/js/webodf/collab/app/resources/app.css');
-		Api\Framework::includeCSS('/api/js/webodf/collab/wodocollabpane.css');
-		Api\Framework::includeCSS('/api/js/webodf/collab/wodotexteditor.css');
-		Api\Framework::includeJS('/filemanager/js/collab.js',null, 'filemanager');
-
-		if (!$content)
-		{
-			if ($file_path)
-			{
-				$content['es_id'] = md5 ($file_path);
-				$content['file_path'] = $paths[1];
-			}
-			else
-			{
-				$content = array();
-			}
-		}
-
-		$actions = self::getActions_edit();
-		if (!Api\Vfs::check_access($paths[1], Api\Vfs::WRITABLE))
-		{
-			unset ($actions['save']);
-			unset ($actions['discard']);
-			unset ($actions['delete']);
-		}
-		$tmpl->setElementAttribute('tools', 'actions', $actions);
-		$preserve = $content;
-		$tmpl->exec('filemanager.filemanager_ui.editor',$content,array(),array(),$preserve,2);
-	}
-
-	/**
-	 * Editor dialog's toolbar actions
-	 *
-	 * @return array return array of actions
-	 */
-	static function getActions_edit()
-	{
-		$group = 0;
-		$actions = array (
-			'save' => array(
-				'caption' => 'Save',
-				'icon' => 'apply',
-				'group' => ++$group,
-				'onExecute' => 'javaScript:app.filemanager.editor_save',
-				'allowOnMultiple' => false,
-				'toolbarDefault' => true
-			),
-			'new' => array(
-				'caption' => 'New',
-				'icon' => 'add',
-				'group' => ++$group,
-				'onExecute' => 'javaScript:app.filemanager.editor_new',
-				'allowOnMultiple' => false,
-				'toolbarDefault' => true
-			),
-			'close' => array(
-				'caption' => 'Close',
-				'icon' => 'close',
-				'group' => ++$group,
-				'onExecute' => 'javaScript:app.filemanager.editor_close',
-				'allowOnMultiple' => false,
-				'toolbarDefault' => true
-			),
-			'saveas' => array(
-				'caption' => 'Save As',
-				'icon' => 'save_all',
-				'group' => ++$group,
-				'onExecute' => 'javaScript:app.filemanager.editor_save',
-				'allowOnMultiple' => false,
-				'toolbarDefault' => true
-			),
-			'delete' => array(
-				'caption' => 'Delete',
-				'icon' => 'delete',
-				'group' => ++$group,
-				'onExecute' => 'javaScript:app.filemanager.editor_delete',
-				'allowOnMultiple' => false,
-				'toolbarDefault' => false
-			),
-			'discard' => array(
-				'caption' => 'Discard',
-				'icon' => 'delete',
-				'group' => ++$group,
-				'onExecute' => 'javaScript:app.filemanager.editor_discard',
-				'allowOnMultiple' => false,
-				'toolbarDefault' => false
-			)
-		);
-		return $actions;
-	}
->>>>>>> 8325dd8... allow to open symlinks to directories like directories
 }