X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/6cbef69555b48386fee70b73bac2c3df4d15ff6a..a1f4ead2c1859852a3a8c6a370c45d32d4a80c0f:/errors.conf?ds=sidebyside

diff --git a/errors.conf b/errors.conf
index 83e924e..5357936 100644
--- a/errors.conf
+++ b/errors.conf
@@ -16,7 +16,7 @@ dir_not_exist     = The directory where you want to create this file or director
 dir_read_failed   = Reading of directory '{DIR}' failed.
 dir_replace       = You are not allowed to replace a directory.
 edit_failed       = Saving of file '{FILE}' failed. The file could be damaged, please check its integrity.
-edit_file_changed = The file you want to edit changed meanwhile. Now, it looks like this: <a href="{SCRIPT}?command=show&amp;file={FILE_URL}">{FILE}</a>. Please try to merge these two versions of the file or save your version of the file using a different name.
+edit_file_changed = The file you want to edit changed meanwhile. Now, it looks like this: <a href="{SCRIPT}?command=show&amp;file={FILE_URL}">{FILE}</a>.
 exist_no_write    = The target file '{FILE}' already exists and you have not enough permissions to replace it.
 file_exists       = A file or directory called '{FILE}' already exists.
 file_too_large    = The file you want to view or edit is too large (max. {SIZE}&nbsp;Bytes).