From 525bea7de3edaf3c9b5851d24fc83823168f7a6b Mon Sep 17 00:00:00 2001
From: llornkcor <llornkcor>
Date: Mon, 24 Nov 2003 08:02:34 +0000
Subject: please watchout for commiting unresolved conflicts

---
(limited to 'packages')

diff --git a/packages b/packages
index 0ff1c90..5a6b683 100644
--- a/packages
+++ b/packages
@@ -183,11 +183,6 @@ CONFIG_MAIN_TAB_EXAMPLE	examples/main-tab	example.pro
 CONFIG_SIMPLE_EXAMPLE	examples/simple	example.pro
 CONFIG_SIMPLE_ICON	examples/simple-icon	example.pro
 CONFIG_SIMPLE_MAIN	examples/simple-main	example.pro
-<<<<<<< packages
 CONFIG_SIMPLE_PIM	examples/simple-pim	example.pro
 CONFIG_BIGSCREEN_EXAMPLE       libopie/big-screen/example      osplitter_mail.pro
-
-=======
-CONFIG_SIMPLE_PIM	examples/simple-pim	example.pro
 CONFIG_APPLET_EXAMPLE	examples/applet	example.pro
->>>>>>> 1.56
--
cgit v0.9.0.2