From bd0f0feb2e1af8a346dc724c81f31214c52128e4 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Wed, 17 Aug 2005 22:44:12 +0000
Subject: conflict settings

---
(limited to 'kabc/vcard/include/generated/TelValue-generated.h')

--
cgit v0.9.0.2