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 'core/pim/datebook/datebookweeklst.h')

diff --git a/core/pim/datebook/datebookweeklst.h b/core/pim/datebook/datebookweeklst.h
index 0bfbcda..f683ce7 100644
--- a/core/pim/datebook/datebookweeklst.h
+++ b/core/pim/datebook/datebookweeklst.h
@@ -120,6 +120,7 @@ public:
     void setDate(const QDate &d );
     int week() const { return _week; };
     QDate date();
+    QDate weekDate() const;
 
 public slots:
     void redraw();
--
cgit v0.9.0.2