From 3a7d9b9ed8f9cf9c7e3d02f9239f327b2b652b0c Mon Sep 17 00:00:00 2001 From: waspe Date: Mon, 03 Nov 2003 18:29:32 +0000 Subject: remove merge conflict --- (limited to 'libopie/orecurrancewidget.h') -- cgit v0.9.0.2