From f7118a6ac3963f50df79ec1f0478c4ad2b0514e4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Apr 2016 15:30:19 +0200
Subject: [PATCH] fix notes of 1.1.8

---
 SeedDMS_Preview/package.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index dac0947e3..ee7067f3a 100644
--- a/SeedDMS_Preview/package.xml
+++ b/SeedDMS_Preview/package.xml
@@ -23,16 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-<<<<<<< HEAD
-- Converters to create preview images are no longer fixed. Those which has been hardcoded before remain the predefined converters, but they can also be changed.
-- command for creating the preview will be called with a given timeout
-add method getFilesize()
-timeout for external commands can be passed to contructor of SeedDMS_Preview_Previewer
-check if object passed to createPreview(), hasPreview() is not null
-set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
-=======
 pass variables to stream_select (required by php7)
->>>>>>> seeddms-5.0.x
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">