ajout de la partie slam dans le dossier web
This commit is contained in:
5
ap23/web/doku/inc/lang/en/conflict.txt
Normal file
5
ap23/web/doku/inc/lang/en/conflict.txt
Normal file
@@ -0,0 +1,5 @@
|
||||
====== 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.
|
||||
Reference in New Issue
Block a user