summaryrefslogtreecommitdiff
path: root/packages
Side-by-side diff
Diffstat (limited to 'packages') (more/less context) (ignore whitespace changes)
-rw-r--r--packages5
1 files changed, 0 insertions, 5 deletions
diff --git a/packages b/packages
index 0ff1c90..5a6b683 100644
--- a/packages
+++ b/packages
@@ -185,9 +185,4 @@ 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