conflict.txt 348 B

12345
  1. ====== A newer version exists ======
  2. A newer version of the document you edited exists. This happens when another user changed the document while you were editing it.
  3. 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.