MediaWiki:Explainconflict
From GNU 68HC11/HC12
(Difference between revisions)
Line 1: | Line 1: | ||
− | Someone else has changed this page since you | + | Someone else has changed this page since you started editing it. |
− | started editing it. | + | |
The upper text area contains the page text as it currently exists. | The upper text area contains the page text as it currently exists. | ||
Your changes are shown in the lower text area. | Your changes are shown in the lower text area. |
Latest revision as of 10:06, 26 January 2007
Someone else has changed this page since you started editing it.
The upper text area contains the page text as it currently exists.
Your changes are shown in the lower text area.
You will have to merge your changes into the existing text.
Only the text in the upper text area will be saved when you
press "Save page".