Jump to content

File:Edit Conflict - Mock with js (as of August 2016).pdf

From Meta, a Wikimedia project coordination wiki

Original file (1,891 × 1,931 pixels, file size: 149 KB, MIME type: application/pdf)

This is a file from the Wikimedia Commons. The description on its description page there is copied below.

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

w:en:Creative Commons
attribution share alike
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.

Captions

Add a one-line explanation of what this file represents

Items portrayed in this file

depicts

inception

9 August 2016

File history

Click on a date/time to view the file as it appeared at that time.

Date/TimeThumbnailDimensionsUserComment
current12:45, 1 September 2016Thumbnail for version as of 12:45, 1 September 20161,891 × 1,931 (149 KB)Lea Voget (WMDE)Reverted to version as of 12:40, 1 September 2016 (UTC)
12:43, 1 September 2016Thumbnail for version as of 12:43, 1 September 20161,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 2016Thumbnail for version as of 12:41, 1 September 20161,891 × 1,931 (137 KB)Lea Voget (WMDE)Reverted to version as of 10:41, 9 August 2016 (UTC)
12:40, 1 September 2016Thumbnail for version as of 12:40, 1 September 20161,891 × 1,931 (149 KB)Lea Voget (WMDE)Updated to better reflect the current diff algorithm
10:41, 9 August 2016Thumbnail for version as of 10:41, 9 August 20161,891 × 1,931 (137 KB)Lea Voget (WMDE)User created page with UploadWizard

Global file usage

Metadata

This file contains additional information, probably added from the digital camera or scanner used to create or digitize it.

If the file has been modified from its original state, some details may not fully reflect the modified file.

Retrieved from "https://meta.wikimedia.org/wiki/File:Edit_Conflict_-_Mock_with_js_(as_of_August_2016).pdf"