diff options
Diffstat (limited to 'lang/en/conflict.txt')
| -rw-r--r-- | lang/en/conflict.txt | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/lang/en/conflict.txt b/lang/en/conflict.txt deleted file mode 100644 index 197bbd6e3..000000000 --- a/lang/en/conflict.txt +++ /dev/null @@ -1,9 +0,0 @@ -====== A newer version exists ====== - -A newer version of the document you edited exists. This happens when another -user changed the document while you were editing it. - -Examine the differences shown below thoroughly, then decide which version to -keep. If you choose ''save'', your version will be saved. Hit ''cancel'' to -keep the current version. - |