From 392f53fc18c7b0a7cabf945d7e0ac1f7c2b86089 Mon Sep 17 00:00:00 2001
From: Robin Rosenberg <robin.rosenberg@dewire.com>
Date: Mon, 28 Apr 2008 00:07:51 +0200
Subject: [PATCH] Improve conflict icon

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
---
 org.spearce.egit.ui/icons/ovr/conflict.gif | Bin 54 -> 64 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/org.spearce.egit.ui/icons/ovr/conflict.gif b/org.spearce.egit.ui/icons/ovr/conflict.gif
index 8f241f4c6a9852807bed46f7865c2cf195d08c77..b444be94a2d09561b212138b1514d5c07610cc07 100644
GIT binary patch
literal 64
zcwTe&bhEHbWM|-D_{hM}z`*dI0SXj<vM@3*Ffr(WI3RfjCc!EF3&kHON*Qck_+rIG
KhIgS14AuZ~{td7I

literal 54
zcwTe&bhEHbWM|-D_`tyMp8*6Ef3h$#FfcOcfH)u-1}5H~{sqfr&oNYKn`Xu^GFSru
D3a1J=

-- 
2.11.4.GIT