From f695ed8bf462bab5df0f6b41d3d3e6ed5b803484 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Tue, 15 Mar 2005 10:59:28 +0000
Subject: sync conflict dialog fix

---
(limited to 'mkipks')

--
cgit v0.9.0.2