File:Edit Conflict - Mock with js (as of August 2016).pdf
Size of the above preview of this PDF file: 960 × 980 pixels. Other resolutions: 250 × 255 pixels | 500 × 511 pixels | 1,280 × 1,307 pixels.
Original file (1,891 × 1,931 pixels, file size: 149 KB, MIME type: application/pdf)
Summary
| Description |
English: This is a mockup of the suggested edit conflict resolution screen as of 08/08/2016 |
| Date | |
| Source | The article text visible comes from https://en.wikipedia.org/wiki/C |
| Author | Jan Dittrich did the mockup, authors of the wikipedia article can be found here: https://en.wikipedia.org/w/index.php?title=C&action=history (all editors before August 2016) |
Licensing
This file is licensed under the Creative Commons Attribution-Share Alike 3.0 Unported license.
- You are free:
- to share – to copy, distribute and transmit the work
- to remix – to adapt the work
- Under the following conditions:
- attribution – You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.
- share alike – If you remix, transform, or build upon the material, you must distribute your contributions under the same or compatible license as the original.
File history
Click on a date/time to view the file as it appeared at that time.
| Date/Time | Thumbnail | Dimensions | User | Comment | |
|---|---|---|---|---|---|
| current | 12:45, 1 September 2016 |  | 1,891 × 1,931 (149 KB) | Lea Voget (WMDE) | Reverted to version as of 12:40, 1 September 2016 (UTC) |
| 12:43, 1 September 2016 |  | 1,891 × 1,931 (149 KB) | Lea Voget (WMDE) | Updated to better reflect the current diff algorithm. This is the second update attempt, since the first one did not change the file. | |
| 12:41, 1 September 2016 |  | 1,891 × 1,931 (137 KB) | Lea Voget (WMDE) | Reverted to version as of 10:41, 9 August 2016 (UTC) | |
| 12:40, 1 September 2016 |  | 1,891 × 1,931 (149 KB) | Lea Voget (WMDE) | Updated to better reflect the current diff algorithm | |
| 10:41, 9 August 2016 |  | 1,891 × 1,931 (137 KB) | Lea Voget (WMDE) | User created page with UploadWizard |
File usage
The following 3 pages use this file:
Global file usage
The following other wikis use this file: