zorba-coders team mailing list archive

[Sorin Marian Nasoi <sorin.marian.nasoi@xxxxxxxxx>]

Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/stack into lp:~zorba-coders/zorba/zorba-experimental.

Requested reviews:
  Zorba Coders (zorba-coders)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/stack/+merge/96031

Fix for the Queue and Stack modules.
-- 
https://code.launchpad.net/~zorba-coders/zorba/stack/+merge/96031
Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/stack into lp:~zorba-coders/zorba/zorba-experimental.

=== modified file 'modules/ExternalModules.conf'
--- modules/ExternalModules.conf	2012-03-05 22:42:52 +0000
+++ modules/ExternalModules.conf	2012-03-06 00:35:21 +0000
@@ -29,7 +29,6 @@
 data-cleaning   bzr  lp:zorba/data-cleaning-module       zorba-2.1
 data-converters bzr  lp:zorba/data-converters-module     zorba-2.1
 data-formatting bzr  lp:zorba/data-formatting-module     zorba-2.1
-email           bzr  lp:zorba/email-module               zorba-2.1
 excel           bzr  lp:zorba/excel-module               zorba-2.1
 geo             bzr  lp:zorba/geo-module                 zorba-2.1
 http-client     bzr  lp:zorba/http-client-module         zorba-2.1
@@ -40,5 +39,11 @@
 security        bzr  lp:zorba/security-module            zorba-2.1
 system          bzr  lp:zorba/system-module              zorba-2.1
 xqxq            bzr  lp:zorba/xqxq-module                zorba-2.1
+<<<<<<< TREE
 stack           bzr  lp:zorba/stack-module
 queue           bzr  lp:zorba/queue-module
+=======
+stack           bzr  lp:~zorba-coders/zorba/my_stack
+queue           bzr  lp:~zorba-coders/zorba/my_queue
+email           bzr  lp:zorba/email-module               zorba-2.1
+>>>>>>> MERGE-SOURCE