gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 15:14:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove left over from git merge conflict

Browse Source
This commit is contained in:
Uwe Steinmann 2016-08-11 12:11:09 +02:00
parent c4401a45df
commit 17c9556337
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
op/op.AddDocument.php
View File

@ -376,7 +376,6 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
} }
} }
<<<<<<< HEAD
$controller->setParam('documentsource', $docsource); $controller->setParam('documentsource', $docsource);
$controller->setParam('folder', $folder); $controller->setParam('folder', $folder);
$controller->setParam('index', $index); $controller->setParam('index', $index);