Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'restructuration/org.eclipse.emf.compare.diff.edit/icons/full/obj16/ConflictingDiffElement.gif')
-rw-r--r--restructuration/org.eclipse.emf.compare.diff.edit/icons/full/obj16/ConflictingDiffElement.gifbin0 -> 204 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/restructuration/org.eclipse.emf.compare.diff.edit/icons/full/obj16/ConflictingDiffElement.gif b/restructuration/org.eclipse.emf.compare.diff.edit/icons/full/obj16/ConflictingDiffElement.gif
new file mode 100644
index 000000000..48a7d1d58
--- /dev/null
+++ b/restructuration/org.eclipse.emf.compare.diff.edit/icons/full/obj16/ConflictingDiffElement.gif
Binary files differ

Back to the top