From 87a9d6badcf518ffd14559ef886ff7729b63b73b Mon Sep 17 00:00:00 2001
From: waspe <waspe>
Date: Mon, 03 Nov 2003 18:28:50 +0000
Subject: resolved merge conflict

---
(limited to 'libopie/xmltree.h')

--
cgit v0.9.0.2