1 files changed, 0 insertions, 5 deletions

diff --git a/packages b/packages
index 0ff1c90..5a6b683 100644
--- a/packages
+++ b/packages
@@ -174,20 +174,15 @@ CONFIG_VOLUMEAPPLET	core/applets/volumeapplet	volumeapplet.pro
         CONFIG_VTAPPLET         core/applets/vtappletvtapplet.pro
         CONFIG_WAVPLUGIN        core/multimedia/opieplayer/wavpluginwavplugin.pro
         CONFIG_WELLENREITER     noncore/net/wellenreiterwellenreiter.pro
         CONFIG_WIRELESSAPPLET   noncore/applets/wirelessappletwirelessapplet.pro
         CONFIG_WLAN     noncore/settings/networksettings/wlanwlan.pro
         CONFIG_PPP      noncore/settings/networksettings/pppppp.pro
         CONFIG_WORDGAME         noncore/games/wordgamewordgame.pro
         CONFIG_ZSAFEnoncore/apps/zsafe zsafe.pro
         CONFIG_MAIN_TAB_EXAMPLE         examples/main-tabexample.pro
         CONFIG_SIMPLE_EXAMPLE   examples/simpleexample.pro
         CONFIG_SIMPLE_ICON      examples/simple-iconexample.pro
         CONFIG_SIMPLE_MAIN      examples/simple-mainexample.pro
-<<<<<<< packages
         CONFIG_SIMPLE_PIM       examples/simple-pimexample.pro
 CONFIG_BIGSCREEN_EXAMPLE       libopie/big-screen/example      osplitter_mail.pro
-
-=======
-        CONFIG_SIMPLE_PIM       examples/simple-pimexample.pro
         CONFIG_APPLET_EXAMPLE   examples/appletexample.pro
->>>>>>> 1.56