openerp-l10n-pt-pt team mailing list archive

[Carlos Almeida <cmsalmeida@xxxxxxxxx>]

Carlos Almeida has proposed merging lp:~cmsa/openerp-pt/openerp-pt-cmsa into lp:openerp-pt.

Requested reviews:
  Carlos Almeida (cmsa)


merge teste
-- 
https://code.launchpad.net/~cmsa/openerp-pt/openerp-pt-cmsa/+merge/40081
Your team OpenERP em Português is subscribed to branch lp:openerp-pt.

=== modified file 'l10n_pt_certificacao_financas/Leia-me.txt'
--- l10n_pt_certificacao_financas/Leia-me.txt	2010-11-04 12:08:00 +0000
+++ l10n_pt_certificacao_financas/Leia-me.txt	2010-11-04 12:47:42 +0000
@@ -1,4 +1,9 @@
-teste terceiro
+<<<<<<< TREE
+teste terceiro
+=======
+teste terceiro do branch do cmsa, para se propor um merge.
+teste terceiro
+>>>>>>> MERGE-SOURCE
 teste segundo para testar pull para meu branch e merge com o branch principal.
 teste para commit no branch 4 Nov 2010