summaryrefslogtreecommitdiff
Unidiff
Diffstat (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
185 CONFIG_SIMPLE_MAIN examples/simple-mainexample.pro 185 CONFIG_SIMPLE_MAIN examples/simple-mainexample.pro
186<<<<<<< packages
187 CONFIG_SIMPLE_PIM examples/simple-pimexample.pro 186 CONFIG_SIMPLE_PIM examples/simple-pimexample.pro
188CONFIG_BIGSCREEN_EXAMPLE libopie/big-screen/example osplitter_mail.pro 187CONFIG_BIGSCREEN_EXAMPLE libopie/big-screen/example osplitter_mail.pro
189
190=======
191 CONFIG_SIMPLE_PIM examples/simple-pimexample.pro
192 CONFIG_APPLET_EXAMPLE examples/appletexample.pro 188 CONFIG_APPLET_EXAMPLE examples/appletexample.pro
193>>>>>>> 1.56