From 2cde25d8061acd536bccd698722952ce8555f5db Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Wed, 24 Aug 2005 18:38:31 +0000
Subject: conflict res fix

---
(limited to 'libkdepim')

--
cgit v0.9.0.2