diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-01-04 16:31:06 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-01-04 16:31:06 +0000 |
| commit | 6dcabdc61c20ab926af15411c326d13cd49f041b (patch) | |
| tree | 88c2fc778df014a28ce9ff59c885d4ba9cfddf9e /files | |
| parent | ebe3ae58cffa8c16ef2b1b74c5b7a9228a5495ff (diff) | |
| parent | e0a058c732cc9d1f279cd6604623d9bf7c196744 (diff) | |
| download | nextcloud-server-6dcabdc61c20ab926af15411c326d13cd49f041b.tar.gz nextcloud-server-6dcabdc61c20ab926af15411c326d13cd49f041b.zip | |
Fixed merge conflict in /files/ajax/move.php
Diffstat (limited to 'files')
| -rw-r--r-- | files/ajax/move.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/files/ajax/move.php b/files/ajax/move.php index c2490ecc6b3..3517901c6cf 100644 --- a/files/ajax/move.php +++ b/files/ajax/move.php @@ -14,7 +14,7 @@ $target = $_GET["target"]; if(OC_Files::move($dir,$file,$target,$file)){ OC_JSON::success(array("data" => array( "dir" => $dir, "files" => $file ))); }else{ - OC_JSON::error(array("data" => array( "message" => "Couldn't move $file" ))); + OC_JSON::error(array("data" => array( "message" => "Could not move $file" ))); } ?> |