Merge lp://staging/~credativ/openobject-addons/lp-889106-6.0 into lp://staging/openobject-addons/extra-6.0

Conflict adding file .bzrignore.  Moved existing file to .bzrignore.moved.
Conflict: can't delete account_analytic_package because it is not empty.  Not deleting.
Conflict because account_analytic_package is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_analytic_package/__init__.py
Contents conflict in account_analytic_package/__terp__.py
Contents conflict in account_analytic_package/account_analytic_package.py
Conflict: can't delete account_analytic_progress because it is not empty.  Not deleting.
Conflict because account_analytic_progress is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_analytic_progress/__init__.py
Contents conflict in account_analytic_progress/__terp__.py
Conflict adding file account_anglo_saxon.  Moved existing file to account_anglo_saxon.moved.
Conflict: can't delete account_asset because it is not empty.  Not deleting.
Conflict because account_asset is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_asset/__init__.py
Contents conflict in account_asset/__terp__.py
Contents conflict in account_asset/account_asset.py
Contents conflict in account_asset/account_asset_invoice.py
Contents conflict in account_asset/account_asset_invoice_view.xml
Conflict: can't delete account_asset/wizard because it is not empty.  Not deleting.
Conflict because account_asset/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_asset/wizard/__init__.py
Contents conflict in account_asset/wizard/wizard_asset_close.py
Contents conflict in account_asset/wizard/wizard_asset_compute.py
Contents conflict in account_asset/wizard/wizard_asset_modify.py
Conflict: can't delete account_base because it is not empty.  Not deleting.
Conflict because account_base is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_base/__init__.py
Contents conflict in account_base/__terp__.py
Contents conflict in account_base/partner.py
Conflict: can't delete account_base/wizard because it is not empty.  Not deleting.
Conflict because account_base/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_base/wizard/__init__.py
Contents conflict in account_base/wizard/account_setup.py
Conflict: can't delete account_bob_import because it is not empty.  Not deleting.
Conflict because account_bob_import is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_bob_import/__init__.py
Contents conflict in account_bob_import/__terp__.py
Contents conflict in account_bob_import/account_bob_import_config.xml
Contents conflict in account_bob_import/bob_import_step_1.py
Contents conflict in account_bob_import/bob_import_step_2.py
Conflict: can't delete account_budget_project because it is not empty.  Not deleting.
Conflict because account_budget_project is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_budget_project/__init__.py
Contents conflict in account_budget_project/__terp__.py
Contents conflict in account_budget_project/account_budget_project.py
Conflict: can't delete account_cash_discount because it is not empty.  Not deleting.
Conflict because account_cash_discount is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_cash_discount/__init__.py
Contents conflict in account_cash_discount/__terp__.py
Contents conflict in account_cash_discount/account_cash_discount.py
Conflict adding file account_coda.  Moved existing file to account_coda.moved.
Conflict: can't delete account_invoice_analytic_required because it is not empty.  Not deleting.
Conflict because account_invoice_analytic_required is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_invoice_analytic_required/__init__.py
Contents conflict in account_invoice_analytic_required/__terp__.py
Contents conflict in account_invoice_analytic_required/account_invoice_analytic_required.py
Conflict: can't delete account_invoice_india because it is not empty.  Not deleting.
Conflict because account_invoice_india is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_invoice_india/__init__.py
Contents conflict in account_invoice_india/__terp__.py
Contents conflict in account_invoice_india/account_invoice.py
Conflict: can't delete account_invoice_india/report because it is not empty.  Not deleting.
Conflict because account_invoice_india/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_invoice_india/report/__init__.py
Contents conflict in account_invoice_india/report/account_journal.py
Contents conflict in account_invoice_india/report/aged_trial_balance.py
Contents conflict in account_invoice_india/report/general_ledger.py
Contents conflict in account_invoice_india/report/invoice.py
Contents conflict in account_invoice_india/report/partner_balance.py
Contents conflict in account_invoice_india/report/report_third_party_ledger.py
Conflict: can't delete account_invoice_india/wizard because it is not empty.  Not deleting.
Conflict because account_invoice_india/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_invoice_india/wizard/__init__.py
Contents conflict in account_invoice_india/wizard/account_chart_wizard.py
Contents conflict in account_invoice_india/wizard/account_create.py
Contents conflict in account_invoice_india/wizard/wizard_aged_trial_balance.py
Contents conflict in account_invoice_india/wizard/wizard_journal_ledger.py
Contents conflict in account_invoice_india/wizard/wizard_partner_balance_report.py
Contents conflict in account_invoice_india/wizard/wizard_third_party_ledger.py
Conflict: can't delete account_invoice_number because it is not empty.  Not deleting.
Conflict because account_invoice_number is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_invoice_number/__init__.py
Contents conflict in account_invoice_number/__terp__.py
Contents conflict in account_invoice_number/account_invoice_number.py
Conflict: can't delete account_invoice_payment_term because it is not empty.  Not deleting.
Conflict because account_invoice_payment_term is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_invoice_payment_term/__init__.py
Contents conflict in account_invoice_payment_term/__terp__.py
Conflict: can't delete account_invoice_payment_term/report because it is not empty.  Not deleting.
Conflict because account_invoice_payment_term/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_invoice_payment_term/report/__init__.py
Contents conflict in account_invoice_payment_term/report/invoice.py
Conflict: can't delete account_journal_visibility because it is not empty.  Not deleting.
Conflict because account_journal_visibility is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_journal_visibility/__init__.py
Contents conflict in account_journal_visibility/__terp__.py
Contents conflict in account_journal_visibility/account_journal.py
Conflict: can't delete account_l10nbe_domiciliation because it is not empty.  Not deleting.
Conflict because account_l10nbe_domiciliation is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_l10nbe_domiciliation/__init__.py
Contents conflict in account_l10nbe_domiciliation/__terp__.py
Contents conflict in account_l10nbe_domiciliation/l10nbe_domiciliation.py
Contents conflict in account_l10nbe_domiciliation/l10nbe_domiciliation_view.xml
Conflict: can't delete account_payment_export because it is not empty.  Not deleting.
Conflict because account_payment_export is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_payment_export/__init__.py
Contents conflict in account_payment_export/__terp__.py
Contents conflict in account_payment_export/payment_export.py
Conflict: can't delete account_payment_export/wizard because it is not empty.  Not deleting.
Conflict because account_payment_export/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_payment_export/wizard/__init__.py
Contents conflict in account_payment_export/wizard/export_wizard.py
Conflict: can't delete account_payment_extension because it is not empty.  Not deleting.
Conflict because account_payment_extension is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_payment_extension/__init__.py
Contents conflict in account_payment_extension/account_invoice.py
Contents conflict in account_payment_extension/account_move_line.py
Conflict: can't delete account_payment_extension/i18n because it is not empty.  Not deleting.
Conflict because account_payment_extension/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_payment_extension/i18n/account_payment_extension.pot
Contents conflict in account_payment_extension/payment.py
Contents conflict in account_payment_extension/payment_view.xml
Conflict: can't delete account_payment_extension/security because it is not empty.  Not deleting.
Conflict because account_payment_extension/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_payment_extension/security/ir.model.access.csv
Conflict: can't delete account_payment_extension/wizard because it is not empty.  Not deleting.
Conflict because account_payment_extension/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_payment_extension/wizard/__init__.py
Contents conflict in account_payment_extension/wizard/wizard_payment_order.py
Contents conflict in account_payment_extension/wizard/wizard_populate_statement.py
Conflict: can't delete account_regularization because it is not empty.  Not deleting.
Conflict because account_regularization is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_regularization/__terp__.py
Contents conflict in account_regularization/account.py
Conflict: can't delete account_regularization/i18n because it is not empty.  Not deleting.
Conflict because account_regularization/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete account_regularization/wizard because it is not empty.  Not deleting.
Conflict because account_regularization/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_regularization/wizard/account_regularization.py
Conflict: can't delete account_reports_india because it is not empty.  Not deleting.
Conflict because account_reports_india is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_reports_india/__init__.py
Contents conflict in account_reports_india/__terp__.py
Conflict: can't delete account_reports_india/report because it is not empty.  Not deleting.
Conflict because account_reports_india/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_reports_india/report/__init__.py
Contents conflict in account_reports_india/report/report_balance_sheet.py
Contents conflict in account_reports_india/report/report_balance_sheet_horizontal.py
Contents conflict in account_reports_india/report/report_pl_account.py
Contents conflict in account_reports_india/report/report_pl_horizontal.py
Contents conflict in account_reports_india/report/report_trial_balance.py
Contents conflict in account_reports_india/report/rml_parse.py
Conflict: can't delete account_reports_india/wizard because it is not empty.  Not deleting.
Conflict because account_reports_india/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_reports_india/wizard/__init__.py
Contents conflict in account_reports_india/wizard/wizard_balance_sheet.py
Contents conflict in account_reports_india/wizard/wizard_pl_report.py
Contents conflict in account_reports_india/wizard/wizard_trial_balance_sheet.py
Conflict: can't delete account_simulation because it is not empty.  Not deleting.
Conflict because account_simulation is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_simulation/__init__.py
Contents conflict in account_simulation/__terp__.py
Contents conflict in account_simulation/account_simulation.py
Contents conflict in account_simulation/account_simulation_view.xml
Conflict: can't delete account_simulation/wizard because it is not empty.  Not deleting.
Conflict because account_simulation/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in account_simulation/wizard/__init__.py
Contents conflict in account_simulation/wizard/wizard_account_chart.py
Conflict: can't delete actions_server_mako_email because it is not empty.  Not deleting.
Conflict because actions_server_mako_email is not versioned, but has versioned children.  Versioned directory.
Contents conflict in actions_server_mako_email/__init__.py
Contents conflict in actions_server_mako_email/__terp__.py
Contents conflict in actions_server_mako_email/asme.py
Conflict: can't delete airport because it is not empty.  Not deleting.
Conflict because airport is not versioned, but has versioned children.  Versioned directory.
Contents conflict in airport/__init__.py
Contents conflict in airport/__terp__.py
Contents conflict in airport/custom.py
Conflict: can't delete analytic_partners because it is not empty.  Not deleting.
Conflict because analytic_partners is not versioned, but has versioned children.  Versioned directory.
Contents conflict in analytic_partners/__init__.py
Contents conflict in analytic_partners/__terp__.py
Contents conflict in analytic_partners/analytic_partners.py
Conflict: can't delete analytic_partners/report because it is not empty.  Not deleting.
Conflict because analytic_partners/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in analytic_partners/report/__init__.py
Contents conflict in analytic_partners/report/analytic_partners_report.py
Conflict: can't delete asterisk because it is not empty.  Not deleting.
Conflict because asterisk is not versioned, but has versioned children.  Versioned directory.
Contents conflict in asterisk/__init__.py
Contents conflict in asterisk/__terp__.py
Contents conflict in asterisk/asterisk.py
Conflict: can't delete asterisk/script because it is not empty.  Not deleting.
Conflict because asterisk/script is not versioned, but has versioned children.  Versioned directory.
Contents conflict in asterisk/script/rpc.py
Contents conflict in asterisk/script/simple_write.py
Contents conflict in asterisk/script/tiny_socket.py
Conflict: can't delete asterisk/wizard because it is not empty.  Not deleting.
Conflict because asterisk/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in asterisk/wizard/__init__.py
Contents conflict in asterisk/wizard/partner_get.py
Conflict: can't delete base_contact_city because it is not empty.  Not deleting.
Conflict because base_contact_city is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete base_contact_team because it is not empty.  Not deleting.
Conflict because base_contact_team is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_contact_team/__init__.py
Contents conflict in base_contact_team/base_contact_team.py
Contents conflict in base_contact_team/base_contact_team_view.xml
Conflict: can't delete base_create_menu because it is not empty.  Not deleting.
Conflict because base_create_menu is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_create_menu/__init__.py
Contents conflict in base_create_menu/__terp__.py
Conflict: can't delete base_create_menu/i18n because it is not empty.  Not deleting.
Conflict because base_create_menu/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete base_create_menu/wizard because it is not empty.  Not deleting.
Conflict because base_create_menu/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_create_menu/wizard/__init__.py
Contents conflict in base_create_menu/wizard/menu_wizard.py
Conflict adding files to base_crypt.  Created directory.
Conflict because base_crypt is not versioned, but has versioned children.  Versioned directory.
Conflict adding file base_crypt.  Moved existing file to base_crypt.moved.
Contents conflict in base_crypt/__init__.py
Contents conflict in base_crypt/__openerp__.py
Contents conflict in base_crypt/crypt.py
Conflict: can't delete base_language because it is not empty.  Not deleting.
Conflict because base_language is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_language/__init__.py
Contents conflict in base_language/__terp__.py
Contents conflict in base_language/base_language.py
Contents conflict in base_language/base_language_data.xml
Conflict adding file base_module_doc_rst.  Moved existing file to base_module_doc_rst.moved.
Conflict: can't delete base_module_merge because it is not empty.  Not deleting.
Conflict because base_module_merge is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_module_merge/__init__.py
Contents conflict in base_module_merge/__terp__.py
Conflict: can't delete base_module_merge/wizard because it is not empty.  Not deleting.
Conflict because base_module_merge/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_module_merge/wizard/__init__.py
Contents conflict in base_module_merge/wizard/base_module_merge.py
Conflict: can't delete base_module_recorder because it is not empty.  Not deleting.
Conflict because base_module_recorder is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_module_recorder/__init__.py
Contents conflict in base_module_recorder/__terp__.py
Conflict: can't delete base_module_recorder/wizard because it is not empty.  Not deleting.
Conflict because base_module_recorder/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_module_recorder/wizard/__init__.py
Contents conflict in base_module_recorder/wizard/base_module_recorder.py
Conflict: can't delete base_partner_gender because it is not empty.  Not deleting.
Conflict because base_partner_gender is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_partner_gender/__init__.py
Contents conflict in base_partner_gender/__terp__.py
Contents conflict in base_partner_gender/base_partner_gender.py
Conflict: can't delete base_partner_relation because it is not empty.  Not deleting.
Conflict because base_partner_relation is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_partner_relation/__init__.py
Contents conflict in base_partner_relation/__terp__.py
Contents conflict in base_partner_relation/partner_relation.py
Conflict: can't delete base_partner_sequence because it is not empty.  Not deleting.
Conflict because base_partner_sequence is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_partner_sequence/__init__.py
Contents conflict in base_partner_sequence/__terp__.py
Contents conflict in base_partner_sequence/partner_sequence.py
Conflict: can't delete base_partner_surname because it is not empty.  Not deleting.
Conflict because base_partner_surname is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_partner_surname/__init__.py
Contents conflict in base_partner_surname/__openerp__.py
Contents conflict in base_partner_surname/partner.py
Contents conflict in base_partner_surname/partner_view.xml
Conflict: can't delete base_report_model because it is not empty.  Not deleting.
Conflict because base_report_model is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_report_model/__init__.py
Contents conflict in base_report_model/__terp__.py
Contents conflict in base_report_model/base_report_model.py
Conflict: can't delete base_translation because it is not empty.  Not deleting.
Conflict because base_translation is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_translation/__init__.py
Contents conflict in base_translation/__terp__.py
Conflict: can't delete base_translation/scripts because it is not empty.  Not deleting.
Conflict because base_translation/scripts is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_translation/scripts/config.py
Contents conflict in base_translation/scripts/translation_server.py
Contents conflict in base_translation/translation.py
Conflict: can't delete base_translation/wizard because it is not empty.  Not deleting.
Conflict because base_translation/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_translation/wizard/__init__.py
Contents conflict in base_translation/wizard/config.py
Contents conflict in base_translation/wizard/wizard_download_file_for_contrib.py
Contents conflict in base_translation/wizard/wizard_download_file_for_publish.py
Contents conflict in base_translation/wizard/wizard_publish_new_version.py
Contents conflict in base_translation/wizard/wizard_review_proposed_contributions.py
Contents conflict in base_translation/wizard/wizard_upload_contribution.py
Conflict: can't delete base_url_menu because it is not empty.  Not deleting.
Conflict because base_url_menu is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_url_menu/__init__.py
Contents conflict in base_url_menu/__terp__.py
Contents conflict in base_url_menu/base_url_menu.py
Conflict: can't delete base_url_menu/wizard because it is not empty.  Not deleting.
Conflict because base_url_menu/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_url_menu/wizard/__init__.py
Contents conflict in base_url_menu/wizard/base_url_menu_wizard.py
Conflict: can't delete base_vat_unique because it is not empty.  Not deleting.
Conflict because base_vat_unique is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_vat_unique/__init__.py
Contents conflict in base_vat_unique/base_vat_unique.py
Conflict: can't delete base_vat_unique/i18n because it is not empty.  Not deleting.
Conflict because base_vat_unique/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete board_dm because it is not empty.  Not deleting.
Conflict because board_dm is not versioned, but has versioned children.  Versioned directory.
Contents conflict in board_dm/__init__.py
Contents conflict in board_dm/__terp__.py
Conflict: can't delete board_frontdesk because it is not empty.  Not deleting.
Conflict because board_frontdesk is not versioned, but has versioned children.  Versioned directory.
Contents conflict in board_frontdesk/__init__.py
Contents conflict in board_frontdesk/__terp__.py
Contents conflict in board_frontdesk/board_frontdesk_view.xml
Conflict: can't delete board_project_portal because it is not empty.  Not deleting.
Conflict because board_project_portal is not versioned, but has versioned children.  Versioned directory.
Contents conflict in board_project_portal/__init__.py
Contents conflict in board_project_portal/__terp__.py
Contents conflict in board_project_portal/board_project_portal.py
Contents conflict in board_project_portal/bug_form.xml
Conflict: can't delete board_reservation because it is not empty.  Not deleting.
Conflict because board_reservation is not versioned, but has versioned children.  Versioned directory.
Contents conflict in board_reservation/__init__.py
Contents conflict in board_reservation/__terp__.py
Contents conflict in board_reservation/board_reservation_view.xml
Conflict: can't delete board_restaurant because it is not empty.  Not deleting.
Conflict because board_restaurant is not versioned, but has versioned children.  Versioned directory.
Contents conflict in board_restaurant/__init__.py
Contents conflict in board_restaurant/__terp__.py
Conflict: can't delete board_service because it is not empty.  Not deleting.
Conflict because board_service is not versioned, but has versioned children.  Versioned directory.
Contents conflict in board_service/__init__.py
Contents conflict in board_service/__terp__.py
Contents conflict in board_service/board_service_view.xml
Conflict: can't delete bookstore because it is not empty.  Not deleting.
Conflict because bookstore is not versioned, but has versioned children.  Versioned directory.
Contents conflict in bookstore/__init__.py
Contents conflict in bookstore/__openerp__.py
Contents conflict in bookstore/account.py
Contents conflict in bookstore/book_data.xml
Contents conflict in bookstore/bookstore.py
Contents conflict in bookstore/bookstore_data.xml
Contents conflict in bookstore/bookstore_view.xml
Conflict: can't delete bookstore/i18n because it is not empty.  Not deleting.
Conflict because bookstore/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in bookstore/invoice.py
Contents conflict in bookstore/partner.py
Conflict: can't delete bookstore/report because it is not empty.  Not deleting.
Conflict because bookstore/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in bookstore/report/__init__.py
Contents conflict in bookstore/report/invoice.py
Contents conflict in bookstore/report/invoice.rml
Contents conflict in bookstore/report/purchase_order.py
Contents conflict in bookstore/report/purchase_order.rml
Contents conflict in bookstore/report/quotation.py
Contents conflict in bookstore/report/quotation.rml
Contents conflict in bookstore/report/sales_order.py
Contents conflict in bookstore/report/sales_order.rml
Contents conflict in bookstore/report_intrastat.py
Contents conflict in bookstore/sale.py
Conflict: can't delete c2c_analytic_wizard because it is not empty.  Not deleting.
Conflict because c2c_analytic_wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_analytic_wizard/__init__.py
Contents conflict in c2c_analytic_wizard/__terp__.py
Conflict: can't delete c2c_analytic_wizard/i18n because it is not empty.  Not deleting.
Conflict because c2c_analytic_wizard/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_analytic_wizard/indicator_account_detail.py
Conflict: can't delete c2c_analytic_wizard/report because it is not empty.  Not deleting.
Conflict because c2c_analytic_wizard/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_analytic_wizard/report/__init__.py
Contents conflict in c2c_analytic_wizard/report/c2c_helper.py
Contents conflict in c2c_analytic_wizard/report/indicator_account_detail.py
Conflict: can't delete c2c_analytic_wizard/wizard because it is not empty.  Not deleting.
Conflict because c2c_analytic_wizard/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_analytic_wizard/wizard/__init__.py
Contents conflict in c2c_analytic_wizard/wizard/associate_analytic_line_from.py
Contents conflict in c2c_analytic_wizard/wizard/associate_analytic_line_toinvoice.py
Contents conflict in c2c_analytic_wizard/wizard/blank_invoice.py
Contents conflict in c2c_analytic_wizard/wizard/dissociate_aal_from_invoice.py
Contents conflict in c2c_analytic_wizard/wizard/indicator_account_detail.py
Contents conflict in c2c_analytic_wizard/wizard/invoice_create.py
Contents conflict in c2c_analytic_wizard/wizard/open_specified_analytic_line.py
Contents conflict in c2c_analytic_wizard/wizard/open_specified_invoices.py
Conflict: can't delete c2c_budget because it is not empty.  Not deleting.
Conflict because c2c_budget is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_budget/__init__.py
Contents conflict in c2c_budget/__terp__.py
Contents conflict in c2c_budget/account.py
Contents conflict in c2c_budget/analytic_account.py
Contents conflict in c2c_budget/c2c_budget.py
Contents conflict in c2c_budget/c2c_budget_item.py
Contents conflict in c2c_budget/c2c_budget_line.py
Contents conflict in c2c_budget/c2c_budget_report_abstraction.py
Contents conflict in c2c_budget/c2c_budget_version.py
Contents conflict in c2c_budget/c2c_budget_view.xml
Contents conflict in c2c_budget/c2c_budget_wizard.xml
Contents conflict in c2c_budget/c2c_budget_wizard_abstraction.py
Conflict: can't delete c2c_budget/report because it is not empty.  Not deleting.
Conflict because c2c_budget/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_budget/report/__init__.py
Contents conflict in c2c_budget/report/budget_by_period.py
Contents conflict in c2c_budget/report/budget_consolidation.py
Contents conflict in c2c_budget/report/budget_vs_reality.py
Contents conflict in c2c_budget/report/compare_versions.py
Contents conflict in c2c_budget/report/helper.py
Conflict: can't delete c2c_budget/wizard because it is not empty.  Not deleting.
Conflict because c2c_budget/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_budget/wizard/__init__.py
Contents conflict in c2c_budget/wizard/advanced_search.py
Contents conflict in c2c_budget/wizard/budget_by_period.py
Contents conflict in c2c_budget/wizard/budget_consolidation.py
Contents conflict in c2c_budget/wizard/budget_vs_reality.py
Contents conflict in c2c_budget/wizard/budgetlines_from_aa.py
Contents conflict in c2c_budget/wizard/compare_versions.py
Contents conflict in c2c_budget/wizard/validate_budget_structure.py
Conflict: can't delete c2c_invoice_report because it is not empty.  Not deleting.
Conflict because c2c_invoice_report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_invoice_report/__init__.py
Contents conflict in c2c_invoice_report/__terp__.py
Conflict: can't delete c2c_invoice_report/i18n because it is not empty.  Not deleting.
Conflict because c2c_invoice_report/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete c2c_invoice_report/report because it is not empty.  Not deleting.
Conflict because c2c_invoice_report/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_invoice_report/report/__init__.py
Contents conflict in c2c_invoice_report/report/invoice.py
Conflict: can't delete c2c_invoice_report/view because it is not empty.  Not deleting.
Conflict because c2c_invoice_report/view is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_invoice_report/view/__init__.py
Contents conflict in c2c_invoice_report/view/invoice.py
Conflict: can't delete c2c_project_activities because it is not empty.  Not deleting.
Conflict because c2c_project_activities is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_project_activities/__init__.py
Contents conflict in c2c_project_activities/__terp__.py
Contents conflict in c2c_project_activities/c2c_project_activities.py
Conflict: can't delete c2c_project_activities/i18n because it is not empty.  Not deleting.
Conflict because c2c_project_activities/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_project_activities/i18n/fr_FR.po
Conflict: can't delete c2c_refresh_so_lines because it is not empty.  Not deleting.
Conflict because c2c_refresh_so_lines is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_refresh_so_lines/__terp__.py
Conflict: can't delete c2c_refresh_so_lines/i18n because it is not empty.  Not deleting.
Conflict because c2c_refresh_so_lines/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_refresh_so_lines/sale.py
Conflict: can't delete c2c_reporting_tools because it is not empty.  Not deleting.
Conflict because c2c_reporting_tools is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_reporting_tools/__init__.py
Contents conflict in c2c_reporting_tools/__terp__.py
Contents conflict in c2c_reporting_tools/c2c_helper.py
Contents conflict in c2c_reporting_tools/c2c_osv_debugger.py
Conflict: can't delete c2c_reporting_tools/core because it is not empty.  Not deleting.
Conflict because c2c_reporting_tools/core is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_reporting_tools/core/__init__.py
Contents conflict in c2c_reporting_tools/core/table_elements.py
Conflict: can't delete c2c_reporting_tools/demo because it is not empty.  Not deleting.
Conflict because c2c_reporting_tools/demo is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_reporting_tools/demo/__init__.py
Contents conflict in c2c_reporting_tools/demo/demo.py
Contents conflict in c2c_reporting_tools/demo/hello_world.py
Conflict: can't delete c2c_reporting_tools/flowables because it is not empty.  Not deleting.
Conflict because c2c_reporting_tools/flowables is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_reporting_tools/flowables/__init__.py
Contents conflict in c2c_reporting_tools/flowables/color_legend.py
Contents conflict in c2c_reporting_tools/flowables/key_value_table.py
Contents conflict in c2c_reporting_tools/flowables/simple_row_table.py
Contents conflict in c2c_reporting_tools/flowables/timebox_chart.py
Conflict: can't delete c2c_reporting_tools/reports because it is not empty.  Not deleting.
Conflict because c2c_reporting_tools/reports is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_reporting_tools/reports/__init__.py
Contents conflict in c2c_reporting_tools/reports/standard_report.py
Conflict: can't delete c2c_reporting_tools/templates because it is not empty.  Not deleting.
Conflict because c2c_reporting_tools/templates is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_reporting_tools/templates/__init__.py
Contents conflict in c2c_reporting_tools/templates/standard_template.py
Contents conflict in c2c_reporting_tools/translation.py
Conflict: can't delete c2c_scan_bvr because it is not empty.  Not deleting.
Conflict because c2c_scan_bvr is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_scan_bvr/__init__.py
Contents conflict in c2c_scan_bvr/__terp__.py
Conflict: can't delete c2c_scan_bvr/wizard because it is not empty.  Not deleting.
Conflict because c2c_scan_bvr/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_scan_bvr/wizard/__init__.py
Contents conflict in c2c_scan_bvr/wizard/scan_bvr.py
Conflict: can't delete c2c_timesheet_reports because it is not empty.  Not deleting.
Conflict because c2c_timesheet_reports is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_timesheet_reports/__init__.py
Contents conflict in c2c_timesheet_reports/__terp__.py
Contents conflict in c2c_timesheet_reports/hr_employee.py
Conflict: can't delete c2c_timesheet_reports/i18n because it is not empty.  Not deleting.
Conflict because c2c_timesheet_reports/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_timesheet_reports/reminder.py
Conflict: can't delete c2c_timesheet_reports/report because it is not empty.  Not deleting.
Conflict because c2c_timesheet_reports/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_timesheet_reports/report/__init__.py
Contents conflict in c2c_timesheet_reports/report/timesheet_status.py
Conflict: can't delete c2c_timesheet_reports/wizard because it is not empty.  Not deleting.
Conflict because c2c_timesheet_reports/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in c2c_timesheet_reports/wizard/__init__.py
Contents conflict in c2c_timesheet_reports/wizard/reminder_config.py
Contents conflict in c2c_timesheet_reports/wizard/timesheet_status.py
Conflict adding file caldav.  Moved existing file to caldav.moved.
Conflict: can't delete carrier_picking because it is not empty.  Not deleting.
Conflict because carrier_picking is not versioned, but has versioned children.  Versioned directory.
Contents conflict in carrier_picking/__init__.py
Conflict: can't delete carrier_picking/i18n because it is not empty.  Not deleting.
Conflict because carrier_picking/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in carrier_picking/i18n/carrier_picking.pot
Contents conflict in carrier_picking/partner.py
Contents conflict in carrier_picking/partner_view.xml
Contents conflict in carrier_picking/stock.py
Contents conflict in carrier_picking/stock_view.xml
Conflict: can't delete cci_account because it is not empty.  Not deleting.
Conflict because cci_account is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_account/__init__.py
Contents conflict in cci_account/__terp__.py
Contents conflict in cci_account/cci_account.py
Contents conflict in cci_account/cci_account_report.xml
Contents conflict in cci_account/cci_account_view.xml
Contents conflict in cci_account/cci_account_wizard.xml
Conflict: can't delete cci_account/report because it is not empty.  Not deleting.
Conflict because cci_account/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_account/report/__init__.py
Contents conflict in cci_account/report/aged_trial_balance.py
Contents conflict in cci_account/report/cci_draft_invoice_info.py
Contents conflict in cci_account/report/cci_vcs_report.py
Contents conflict in cci_account/report/partner_balance.py
Contents conflict in cci_account/report/partner_balance.rml
Contents conflict in cci_account/report/report_account_invoice_layout.py
Contents conflict in cci_account/report/special_message_invoice.py
Contents conflict in cci_account/report/special_message_invoice.rml
Contents conflict in cci_account/report/special_message_invoice.sxw
Contents conflict in cci_account/report/third_party_ledger.py
Conflict: can't delete cci_account/wizard because it is not empty.  Not deleting.
Conflict because cci_account/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_account/wizard/__init__.py
Contents conflict in cci_account/wizard/cci_switched_debit_credit.py
Contents conflict in cci_account/wizard/cci_use_model.py
Contents conflict in cci_account/wizard/cci_wizard_aged_trial_balance.py
Contents conflict in cci_account/wizard/cci_wizard_partner_balance_report.py
Contents conflict in cci_account/wizard/cci_wizard_third_party_ledger.py
Contents conflict in cci_account/wizard/cci_wizard_vcs.py
Contents conflict in cci_account/wizard/invoice_special_message.py
Conflict: can't delete cci_audittrail because it is not empty.  Not deleting.
Conflict because cci_audittrail is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_audittrail/__init__.py
Contents conflict in cci_audittrail/__terp__.py
Contents conflict in cci_audittrail/audittrail.py
Conflict: can't delete cci_base_contact because it is not empty.  Not deleting.
Conflict because cci_base_contact is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_base_contact/__init__.py
Contents conflict in cci_base_contact/__terp__.py
Contents conflict in cci_base_contact/cci_base_contact.py
Contents conflict in cci_base_contact/cci_base_contact_view.xml
Conflict: can't delete cci_country because it is not empty.  Not deleting.
Conflict because cci_country is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_country/__init__.py
Contents conflict in cci_country/__terp__.py
Contents conflict in cci_country/cci_country.py
Conflict: can't delete cci_crm because it is not empty.  Not deleting.
Conflict because cci_crm is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_crm/__init__.py
Contents conflict in cci_crm/__terp__.py
Contents conflict in cci_crm/cci_crm.py
Contents conflict in cci_crm/cci_crm_data.xml
Contents conflict in cci_crm/cci_crm_view.xml
Conflict: can't delete cci_crm_profile because it is not empty.  Not deleting.
Conflict because cci_crm_profile is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_crm_profile/__init__.py
Contents conflict in cci_crm_profile/__terp__.py
Contents conflict in cci_crm_profile/cci_crm_profile.py
Contents conflict in cci_crm_profile/cci_crm_profile_view.xml
Conflict: can't delete cci_data_csv because it is not empty.  Not deleting.
Conflict because cci_data_csv is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_data_csv/__init__.py
Contents conflict in cci_data_csv/__terp__.py
Conflict: can't delete cci_event because it is not empty.  Not deleting.
Conflict because cci_event is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_event/__init__.py
Contents conflict in cci_event/__terp__.py
Contents conflict in cci_event/cci_event.py
Contents conflict in cci_event/cci_event_view.xml
Contents conflict in cci_event/cci_event_wizard.xml
Conflict: can't delete cci_event/wizard because it is not empty.  Not deleting.
Conflict because cci_event/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_event/wizard/__init__.py
Contents conflict in cci_event/wizard/event_copy.py
Contents conflict in cci_event/wizard/registration_missing_checks.py
Conflict: can't delete cci_membership because it is not empty.  Not deleting.
Conflict because cci_membership is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_membership/__init__.py
Contents conflict in cci_membership/__terp__.py
Contents conflict in cci_membership/cci_membership.py
Contents conflict in cci_membership/cci_membership_view.xml
Contents conflict in cci_membership/cci_membership_wizard.xml
Conflict: can't delete cci_membership/report because it is not empty.  Not deleting.
Conflict because cci_membership/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_membership/report/__init__.py
Contents conflict in cci_membership/report/report_members_total_sold.py
Conflict: can't delete cci_membership/wizard because it is not empty.  Not deleting.
Conflict because cci_membership/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_membership/wizard/__init__.py
Contents conflict in cci_membership/wizard/members_total_sold.py
Contents conflict in cci_membership/wizard/show_partners.py
Conflict: can't delete cci_mission because it is not empty.  Not deleting.
Conflict because cci_mission is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_mission/__init__.py
Contents conflict in cci_mission/__terp__.py
Contents conflict in cci_mission/cci_mission.py
Contents conflict in cci_mission/cci_mission_report.xml
Contents conflict in cci_mission/cci_mission_view.xml
Contents conflict in cci_mission/cci_mission_wizard.xml
Contents conflict in cci_mission/cci_mission_workflow.xml
Conflict: can't delete cci_mission/report because it is not empty.  Not deleting.
Conflict because cci_mission/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_mission/report/__init__.py
Contents conflict in cci_mission/report/report_print_carnet.py
Conflict: can't delete cci_mission/wizard because it is not empty.  Not deleting.
Conflict because cci_mission/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_mission/wizard/__init__.py
Contents conflict in cci_mission/wizard/cci_encode_cash.py
Contents conflict in cci_mission/wizard/create_invoice.py
Contents conflict in cci_mission/wizard/create_invoice_carnet.py
Contents conflict in cci_mission/wizard/create_invoice_embassy.py
Contents conflict in cci_mission/wizard/make_invoice_group.py
Contents conflict in cci_mission/wizard/wizard_create_embassy_folder.py
Contents conflict in cci_mission/wizard/wizard_federation_certificates_sending.py
Contents conflict in cci_mission/wizard/wizard_federation_sending.py
Contents conflict in cci_mission/wizard/wizard_print_carnet.py
Contents conflict in cci_mission/wizard/wizard_simulation_carnet.py
Conflict: can't delete cci_partner because it is not empty.  Not deleting.
Conflict because cci_partner is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_partner/__init__.py
Contents conflict in cci_partner/__terp__.py
Contents conflict in cci_partner/cci_data.xml
Contents conflict in cci_partner/cci_partner.py
Contents conflict in cci_partner/cci_partner_view.xml
Contents conflict in cci_partner/cci_partner_wizard.xml
Conflict: can't delete cci_partner/report because it is not empty.  Not deleting.
Conflict because cci_partner/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_partner/report/__init__.py
Contents conflict in cci_partner/report/report_count_invoices.py
Conflict: can't delete cci_partner/security because it is not empty.  Not deleting.
Conflict because cci_partner/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_partner/security/ir.model.access.csv
Conflict: can't delete cci_partner/wizard because it is not empty.  Not deleting.
Conflict because cci_partner/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_partner/wizard/__init__.py
Contents conflict in cci_partner/wizard/cci_partner_event_history.py
Contents conflict in cci_partner/wizard/cci_wizard_sms.py
Contents conflict in cci_partner/wizard/cci_wizard_spam.py
Conflict: can't delete cci_purchase because it is not empty.  Not deleting.
Conflict because cci_purchase is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_purchase/__init__.py
Contents conflict in cci_purchase/__terp__.py
Contents conflict in cci_purchase/cci_purchase.py
Contents conflict in cci_purchase/cci_purchase_view.xml
Contents conflict in cci_purchase/cci_purchase_workflow.xml
Conflict: can't delete cci_sales because it is not empty.  Not deleting.
Conflict because cci_sales is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_sales/__init__.py
Contents conflict in cci_sales/__terp__.py
Contents conflict in cci_sales/cci_sales.py
Contents conflict in cci_sales/cci_sales_view.xml
Conflict: can't delete cci_security because it is not empty.  Not deleting.
Conflict because cci_security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_security/__terp__.py
Contents conflict in cci_security/import.py
Conflict: can't delete cci_timesheet because it is not empty.  Not deleting.
Conflict because cci_timesheet is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_timesheet/__init__.py
Contents conflict in cci_timesheet/__terp__.py
Contents conflict in cci_timesheet/cci_timesheet.py
Contents conflict in cci_timesheet/cci_timesheet_view.xml
Conflict: can't delete cci_timesheet/wizard because it is not empty.  Not deleting.
Conflict because cci_timesheet/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_timesheet/wizard/__init__.py
Contents conflict in cci_timesheet/wizard/create_timesheet_line.py
Conflict: can't delete cci_translation because it is not empty.  Not deleting.
Conflict because cci_translation is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_translation/__init__.py
Contents conflict in cci_translation/__terp__.py
Contents conflict in cci_translation/cci_translation.py
Contents conflict in cci_translation/cci_translation_view.xml
Contents conflict in cci_translation/cci_translation_wizard.xml
Conflict: can't delete cci_translation/wizard because it is not empty.  Not deleting.
Conflict because cci_translation/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in cci_translation/wizard/__init__.py
Contents conflict in cci_translation/wizard/make_invoice.py
Conflict: can't delete chemical because it is not empty.  Not deleting.
Conflict because chemical is not versioned, but has versioned children.  Versioned directory.
Contents conflict in chemical/__init__.py
Contents conflict in chemical/__terp__.py
Contents conflict in chemical/chemical.py
Conflict: can't delete chemical/product because it is not empty.  Not deleting.
Conflict because chemical/product is not versioned, but has versioned children.  Versioned directory.
Contents conflict in chemical/product/__init__.py
Contents conflict in chemical/product/risque_securite_danger.py
Conflict: can't delete chricar_partner_parent_companies because it is not empty.  Not deleting.
Conflict because chricar_partner_parent_companies is not versioned, but has versioned children.  Versioned directory.
Contents conflict in chricar_partner_parent_companies/__init__.py
Contents conflict in chricar_partner_parent_companies/__terp__.py
Conflict: can't delete chricar_partner_parent_companies/i18n because it is not empty.  Not deleting.
Conflict because chricar_partner_parent_companies/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete chricar_product_gtin because it is not empty.  Not deleting.
Conflict because chricar_product_gtin is not versioned, but has versioned children.  Versioned directory.
Contents conflict in chricar_product_gtin/__init__.py
Contents conflict in chricar_product_gtin/chricar_product_gtin.py
Conflict: can't delete chricar_product_gtin/i18n because it is not empty.  Not deleting.
Conflict because chricar_product_gtin/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete chricar_product_image because it is not empty.  Not deleting.
Conflict because chricar_product_image is not versioned, but has versioned children.  Versioned directory.
Contents conflict in chricar_product_image/__init__.py
Contents conflict in chricar_product_image/__terp__.py
Contents conflict in chricar_product_image/chricar_product_image.py
Conflict: can't delete chricar_product_image/i18n because it is not empty.  Not deleting.
Conflict because chricar_product_image/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete city because it is not empty.  Not deleting.
Conflict because city is not versioned, but has versioned children.  Versioned directory.
Contents conflict in city/city.py
Contents conflict in city/city_view.xml
Conflict: can't delete city/i18n because it is not empty.  Not deleting.
Conflict because city/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete commission because it is not empty.  Not deleting.
Conflict because commission is not versioned, but has versioned children.  Versioned directory.
Contents conflict in commission/__init__.py
Contents conflict in commission/__terp__.py
Contents conflict in commission/commission.py
Contents conflict in commission/commission_sequence.xml
Contents conflict in commission/commission_view.xml
Contents conflict in commission/partner.py
Contents conflict in commission/partner_view.xml
Contents conflict in commission/pricelist.py
Contents conflict in commission/pricelist_view.xml
Conflict: can't delete commission/report because it is not empty.  Not deleting.
Conflict because commission/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in commission/report/__init__.py
Contents conflict in commission/report/saleagent_info.py
Contents conflict in commission/saleagent.py
Contents conflict in commission/saleagent_demo.xml
Contents conflict in commission/saleagent_sequence.xml
Contents conflict in commission/saleagent_view.xml
Conflict: can't delete commission/security because it is not empty.  Not deleting.
Conflict because commission/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in commission/security/ir.model.access.csv
Conflict: can't delete commission/wizard because it is not empty.  Not deleting.
Conflict because commission/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in commission/wizard/__init__.py
Contents conflict in commission/wizard/all_commission.py
Contents conflict in commission/wizard/saleagent_info_wizard.py
Contents conflict in commission/wizard/wizard_commission.py
Conflict: can't delete comparison because it is not empty.  Not deleting.
Conflict because comparison is not versioned, but has versioned children.  Versioned directory.
Contents conflict in comparison/comparison.py
Conflict: can't delete comparison/i18n because it is not empty.  Not deleting.
Conflict because comparison/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete comparison/website because it is not empty.  Not deleting.
Conflict because comparison/website is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete comparison/website/erpComparator because it is not empty.  Not deleting.
Conflict because comparison/website/erpComparator is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete comparison/website/erpComparator/erpcomparator because it is not empty.  Not deleting.
Conflict because comparison/website/erpComparator/erpcomparator is not versioned, but has versioned children.  Versioned directory.
Contents conflict in comparison/website/erpComparator/erpcomparator/common.py
Conflict: can't delete comparison/website/erpComparator/erpcomparator/config because it is not empty.  Not deleting.
Conflict because comparison/website/erpComparator/erpcomparator/config is not versioned, but has versioned children.  Versioned directory.
Contents conflict in comparison/website/erpComparator/erpcomparator/config/__init__.py
Contents conflict in comparison/website/erpComparator/erpcomparator/rpc.py
Conflict: can't delete comparison/website/erpComparator/erpcomparator/static because it is not empty.  Not deleting.
Conflict because comparison/website/erpComparator/erpcomparator/static is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete comparison/website/erpComparator/erpcomparator/static/planet_comparison because it is not empty.  Not deleting.
Conflict because comparison/website/erpComparator/erpcomparator/static/planet_comparison is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet because it is not empty.  Not deleting.
Conflict because comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet is not versioned, but has versioned children.  Versioned directory.
Contents conflict in comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet-cache.py
Contents conflict in comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet.py
Contents conflict in comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet/__init__.py
Contents conflict in comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet/atomstyler.py
Contents conflict in comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet/cache.py
Conflict: can't delete comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet/compat_logging because it is not empty.  Not deleting.
Conflict because comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet/compat_logging is not versioned, but has versioned children.  Versioned directory.
Contents conflict in comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet/compat_logging/handlers.py
Contents conflict in comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet/feedparser.py
Contents conflict in comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet/htmltmpl.py
Contents conflict in comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet/sanitize.py
Contents conflict in comparison/website/erpComparator/erpcomparator/static/planet_comparison/planet/timeoutsocket.py
Conflict: can't delete crm_bayes because it is not empty.  Not deleting.
Conflict because crm_bayes is not versioned, but has versioned children.  Versioned directory.
Contents conflict in crm_bayes/__init__.py
Contents conflict in crm_bayes/__terp__.py
Contents conflict in crm_bayes/crm_bayes.py
Contents conflict in crm_bayes/crm_bayes_demo.xml
Contents conflict in crm_bayes/crm_bayes_view.xml
Conflict: can't delete crm_livechat because it is not empty.  Not deleting.
Conflict because crm_livechat is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete crm_livechat/crm-lc because it is not empty.  Not deleting.
Conflict because crm_livechat/crm-lc is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete crm_livechat/crm-lc/livechat because it is not empty.  Not deleting.
Conflict because crm_livechat/crm-lc/livechat is not versioned, but has versioned children.  Versioned directory.
Contents conflict in crm_livechat/crm-lc/livechat/common.py
Contents conflict in crm_livechat/crm-lc/livechat/controllers.py
Contents conflict in crm_livechat/crm-lc/livechat/debug.py
Contents conflict in crm_livechat/crm-lc/livechat/rpc.py
Conflict: can't delete crm_livechat/crm-lc/livechat/subcontrollers because it is not empty.  Not deleting.
Conflict because crm_livechat/crm-lc/livechat/subcontrollers is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete crm_livechat/crm-lc/livechat/subcontrollers/livechat because it is not empty.  Not deleting.
Conflict because crm_livechat/crm-lc/livechat/subcontrollers/livechat is not versioned, but has versioned children.  Versioned directory.
Contents conflict in crm_livechat/crm-lc/livechat/subcontrollers/livechat/chatfunc.py
Contents conflict in crm_livechat/crm-lc/livechat/xmlstream.py
Contents conflict in crm_livechat/crm_livechat.py
Conflict: can't delete crm_telemarketing because it is not empty.  Not deleting.
Conflict because crm_telemarketing is not versioned, but has versioned children.  Versioned directory.
Contents conflict in crm_telemarketing/__init__.py
Contents conflict in crm_telemarketing/__terp__.py
Contents conflict in crm_telemarketing/crm_telemarketing.py
Conflict: can't delete crm_telemarketing/i18n because it is not empty.  Not deleting.
Conflict because crm_telemarketing/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete crm_telemarketing/report because it is not empty.  Not deleting.
Conflict because crm_telemarketing/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in crm_telemarketing/report/__init__.py
Conflict: can't delete crm_telemarketing/wizard because it is not empty.  Not deleting.
Conflict because crm_telemarketing/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in crm_telemarketing/wizard/__init__.py
Contents conflict in crm_telemarketing/wizard/create_call_list.py
Contents conflict in crm_telemarketing/wizard/direct_poll.py
Contents conflict in crm_telemarketing/wizard/meeting_planify.py
Conflict: can't delete currency_rate because it is not empty.  Not deleting.
Conflict because currency_rate is not versioned, but has versioned children.  Versioned directory.
Contents conflict in currency_rate/__init__.py
Contents conflict in currency_rate/__terp__.py
Contents conflict in currency_rate/res_currency.py
Conflict: can't delete currency_rate/wizard because it is not empty.  Not deleting.
Conflict because currency_rate/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in currency_rate/wizard/__init__.py
Contents conflict in currency_rate/wizard/currency_rate.py
Conflict: can't delete currency_rate_update because it is not empty.  Not deleting.
Path conflict: currency_rate_update / <deleted>
Conflict because currency_rate_update is not versioned, but has versioned children.  Versioned directory.
Contents conflict in currency_rate_update/__init__.py
Contents conflict in currency_rate_update/company.py
Contents conflict in currency_rate_update/company_view.xml
Contents conflict in currency_rate_update/currency_rate_update.py
Contents conflict in currency_rate_update/currency_rate_update.xml
Conflict: can't delete currency_rate_update/security because it is not empty.  Not deleting.
Conflict because currency_rate_update/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in currency_rate_update/security/security.xml
Conflict: can't delete demo_setup because it is not empty.  Not deleting.
Conflict because demo_setup is not versioned, but has versioned children.  Versioned directory.
Contents conflict in demo_setup/__init__.py
Contents conflict in demo_setup/__terp__.py
Conflict: can't delete demo_setup/i18n because it is not empty.  Not deleting.
Conflict because demo_setup/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete discount_campaign because it is not empty.  Not deleting.
Conflict because discount_campaign is not versioned, but has versioned children.  Versioned directory.
Contents conflict in discount_campaign/__init__.py
Contents conflict in discount_campaign/__terp__.py
Contents conflict in discount_campaign/discount_campaign.py
Contents conflict in discount_campaign/discount_campaign_view.xml
Conflict: can't delete discount_campaign/security because it is not empty.  Not deleting.
Conflict because discount_campaign/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in discount_campaign/security/ir.model.access.csv
Conflict: can't delete dm because it is not empty.  Not deleting.
Conflict because dm is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm/__init__.py
Contents conflict in dm/__terp__.py
Contents conflict in dm/dm_campaign.py
Contents conflict in dm/dm_campaign_view.xml
Contents conflict in dm/dm_data.xml
Contents conflict in dm/dm_demo.xml
Contents conflict in dm/dm_document.py
Contents conflict in dm/dm_document_view.xml
Contents conflict in dm/dm_engine.py
Contents conflict in dm/dm_engine_view.xml
Contents conflict in dm/dm_inherit.py
Contents conflict in dm/dm_inherit_view.xml
Contents conflict in dm/dm_offer.py
Contents conflict in dm/dm_offer_step.py
Contents conflict in dm/dm_offer_step_view.xml
Contents conflict in dm/dm_offer_view.xml
Contents conflict in dm/dm_report.xml
Contents conflict in dm/dm_report_design.py
Contents conflict in dm/dm_wizard.xml
Contents conflict in dm/dm_workflow.xml
Conflict: can't delete dm/i18n because it is not empty.  Not deleting.
Conflict because dm/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm/i18n/fr_FR.po
Conflict: can't delete dm/plugin because it is not empty.  Not deleting.
Conflict because dm/plugin is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm/plugin/__init__.py
Contents conflict in dm/plugin/current_time.py
Contents conflict in dm/plugin/customer_function.py
Contents conflict in dm/plugin/dynamic_text.py
Contents conflict in dm/plugin/php_url.py
Conflict: can't delete dm/report because it is not empty.  Not deleting.
Conflict because dm/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm/report/__init__.py
Contents conflict in dm/report/dm_campaign.rml
Contents conflict in dm/report/dm_campaign_report.py
Contents conflict in dm/report/dm_document_report.py
Contents conflict in dm/report/dm_ir_action_report.py
Contents conflict in dm/report/dm_offer.rml
Contents conflict in dm/report/dm_offer.sxw
Contents conflict in dm/report/dm_offer_report.py
Contents conflict in dm/report/dm_print_offer_graph.py
Contents conflict in dm/report/pkg_insert_doc09_report.rml
Contents conflict in dm/report/pkg_insert_doc09_report.sxw
Conflict: can't delete dm/security because it is not empty.  Not deleting.
Conflict because dm/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm/security/dm_security.xml
Contents conflict in dm/security/ir.model.access.csv
Conflict: can't delete dm/wizard because it is not empty.  Not deleting.
Conflict because dm/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm/wizard/__init__.py
Contents conflict in dm/wizard/dm_address_after_sale_action.py
Contents conflict in dm/wizard/dm_all_document_report.py
Contents conflict in dm/wizard/dm_campaign_copy.py
Contents conflict in dm/wizard/dm_document_report.py
Contents conflict in dm/wizard/dm_offer_document.py
Contents conflict in dm/wizard/dm_partner_address_segments.py
Contents conflict in dm/wizard/dm_proposition_copy.py
Contents conflict in dm/wizard/dm_so_after_sale_action.py
Contents conflict in dm/wizard/dm_workitem_wizard.py
Conflict: can't delete dm_after_sale because it is not empty.  Not deleting.
Conflict because dm_after_sale is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_after_sale/__init__.py
Contents conflict in dm_after_sale/__terp__.py
Contents conflict in dm_after_sale/dm_after_sale.py
Contents conflict in dm_after_sale/dm_after_sale_view.xml
Conflict: can't delete dm_after_sale/security because it is not empty.  Not deleting.
Conflict because dm_after_sale/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_after_sale/security/ir.model.access.csv
Conflict: can't delete dm_base_contact because it is not empty.  Not deleting.
Conflict because dm_base_contact is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_base_contact/__init__.py
Contents conflict in dm_base_contact/__terp__.py
Conflict: can't delete dm_campaign_group because it is not empty.  Not deleting.
Conflict because dm_campaign_group is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_campaign_group/__init__.py
Contents conflict in dm_campaign_group/__terp__.py
Contents conflict in dm_campaign_group/dm_campaign_group.py
Contents conflict in dm_campaign_group/dm_campaign_group_view.xml
Conflict: can't delete dm_campaign_group/i18n because it is not empty.  Not deleting.
Conflict because dm_campaign_group/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete dm_campaign_group/wizard because it is not empty.  Not deleting.
Conflict because dm_campaign_group/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_campaign_group/wizard/__init__.py
Contents conflict in dm_campaign_group/wizard/dm_campaign_group.py
Conflict: can't delete dm_delivery because it is not empty.  Not deleting.
Conflict because dm_delivery is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_delivery/__init__.py
Contents conflict in dm_delivery/__terp__.py
Contents conflict in dm_delivery/dm_delivery.py
Contents conflict in dm_delivery/dm_delivery_data.xml
Conflict: can't delete dm_document because it is not empty.  Not deleting.
Conflict because dm_document is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_document/__init__.py
Contents conflict in dm_document/__terp__.py
Conflict: can't delete dm_emailvision because it is not empty.  Not deleting.
Conflict because dm_emailvision is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_emailvision/__init__.py
Contents conflict in dm_emailvision/__terp__.py
Contents conflict in dm_emailvision/dm_emailvision_api.py
Contents conflict in dm_emailvision/dm_emailvision_data.xml
Contents conflict in dm_emailvision/dm_emailvision_view.xml
Conflict: can't delete dm_extract because it is not empty.  Not deleting.
Conflict because dm_extract is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_extract/__init__.py
Contents conflict in dm_extract/__terp__.py
Contents conflict in dm_extract/dm_extract.py
Contents conflict in dm_extract/dm_extract_data.xml
Contents conflict in dm_extract/dm_extract_view.xml
Conflict: can't delete dm_extract_sale because it is not empty.  Not deleting.
Conflict because dm_extract_sale is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_extract_sale/__init__.py
Contents conflict in dm_extract_sale/__terp__.py
Contents conflict in dm_extract_sale/dm_extract_sale.py
Contents conflict in dm_extract_sale/dm_extract_sale_view.xml
Conflict: can't delete dm_lead because it is not empty.  Not deleting.
Conflict because dm_lead is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_lead/__init__.py
Contents conflict in dm_lead/__terp__.py
Contents conflict in dm_lead/dm_lead.py
Contents conflict in dm_lead/dm_lead_data.xml
Contents conflict in dm_lead/dm_lead_view.xml
Conflict: can't delete dm_partner_address because it is not empty.  Not deleting.
Conflict because dm_partner_address is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_partner_address/__init__.py
Contents conflict in dm_partner_address/__terp__.py
Contents conflict in dm_partner_address/dm_partner_address.py
Contents conflict in dm_partner_address/dm_partner_address_view.xml
Conflict: can't delete dm_payment_rules because it is not empty.  Not deleting.
Conflict because dm_payment_rules is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete dm_price_progression because it is not empty.  Not deleting.
Conflict because dm_price_progression is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_price_progression/__init__.py
Contents conflict in dm_price_progression/__terp__.py
Contents conflict in dm_price_progression/dm_price_progression.py
Contents conflict in dm_price_progression/dm_price_progression_view.xml
Conflict: can't delete dm_price_progression/i18n because it is not empty.  Not deleting.
Conflict because dm_price_progression/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete dm_price_progression/wizard because it is not empty.  Not deleting.
Conflict because dm_price_progression/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_price_progression/wizard/__init__.py
Contents conflict in dm_price_progression/wizard/dm_proposition_products.py
Conflict: can't delete dm_purchase because it is not empty.  Not deleting.
Conflict because dm_purchase is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_purchase/__init__.py
Contents conflict in dm_purchase/__terp__.py
Contents conflict in dm_purchase/dm_purchase.py
Contents conflict in dm_purchase/dm_purchase_view.xml
Conflict: can't delete dm_purchase_advanced because it is not empty.  Not deleting.
Conflict because dm_purchase_advanced is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_purchase_advanced/__init__.py
Contents conflict in dm_purchase_advanced/__terp__.py
Contents conflict in dm_purchase_advanced/dm_purchase_advanced.py
Contents conflict in dm_purchase_advanced/dm_purchase_advanced_view.xml
Conflict: can't delete dm_purchase_advanced/security because it is not empty.  Not deleting.
Conflict because dm_purchase_advanced/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_purchase_advanced/security/ir.model.access.csv
Conflict: can't delete dm_retro_planning because it is not empty.  Not deleting.
Conflict because dm_retro_planning is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_retro_planning/__init__.py
Contents conflict in dm_retro_planning/__terp__.py
Contents conflict in dm_retro_planning/dm_retro_planning.py
Contents conflict in dm_retro_planning/dm_retro_planning_view.xml
Conflict: can't delete dm_retro_planning/security because it is not empty.  Not deleting.
Conflict because dm_retro_planning/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_retro_planning/security/ir.model.access.csv
Conflict: can't delete dm_retro_planning/wizard because it is not empty.  Not deleting.
Conflict because dm_retro_planning/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_retro_planning/wizard/__init__.py
Contents conflict in dm_retro_planning/wizard/dm_campaign_group_project.py
Contents conflict in dm_retro_planning/wizard/dm_campaign_group_tasks.py
Contents conflict in dm_retro_planning/wizard/dm_campaign_project.py
Contents conflict in dm_retro_planning/wizard/dm_campaign_tasks.py
Conflict: can't delete dm_sale because it is not empty.  Not deleting.
Conflict because dm_sale is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_sale/__init__.py
Contents conflict in dm_sale/__terp__.py
Contents conflict in dm_sale/dm_sale.py
Contents conflict in dm_sale/dm_sale_data.xml
Contents conflict in dm_sale/dm_sale_demo.xml
Contents conflict in dm_sale/dm_sale_view.xml
Conflict: can't delete dm_simulator because it is not empty.  Not deleting.
Conflict because dm_simulator is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_simulator/__init__.py
Contents conflict in dm_simulator/__terp__.py
Contents conflict in dm_simulator/dm_simulator.py
Contents conflict in dm_simulator/dm_simulator_demo.xml
Contents conflict in dm_simulator/dm_simulator_view.xml
Conflict: can't delete dm_website because it is not empty.  Not deleting.
Conflict because dm_website is not versioned, but has versioned children.  Versioned directory.
Contents conflict in dm_website/__init__.py
Contents conflict in dm_website/__terp__.py
Contents conflict in dm_website/dm_website.py
Contents conflict in dm_website/dm_website_data.xml
Contents conflict in dm_website/dm_website_demo.xml
Contents conflict in dm_website/dm_website_view.xml
Conflict: can't delete document_extension because it is not empty.  Not deleting.
Conflict because document_extension is not versioned, but has versioned children.  Versioned directory.
Contents conflict in document_extension/__init__.py
Contents conflict in document_extension/__terp__.py
Contents conflict in document_extension/document.py
Conflict: can't delete document_lock because it is not empty.  Not deleting.
Conflict because document_lock is not versioned, but has versioned children.  Versioned directory.
Contents conflict in document_lock/__init__.py
Contents conflict in document_lock/__terp__.py
Contents conflict in document_lock/document_lock.py
Conflict: can't delete document_no_contentindex because it is not empty.  Not deleting.
Conflict because document_no_contentindex is not versioned, but has versioned children.  Versioned directory.
Contents conflict in document_no_contentindex/__init__.py
Contents conflict in document_no_contentindex/__terp__.py
Contents conflict in document_no_contentindex/document_no_contentindex.py
Conflict: can't delete document_rule because it is not empty.  Not deleting.
Conflict because document_rule is not versioned, but has versioned children.  Versioned directory.
Contents conflict in document_rule/__init__.py
Contents conflict in document_rule/__terp__.py
Contents conflict in document_rule/document_rule.py
Conflict: can't delete document_sftp because it is not empty.  Not deleting.
Conflict because document_sftp is not versioned, but has versioned children.  Versioned directory.
Contents conflict in document_sftp/__init__.py
Contents conflict in document_sftp/__terp__.py
Contents conflict in document_sftp/document.py
Conflict: can't delete document_sftp/sftp_server because it is not empty.  Not deleting.
Conflict because document_sftp/sftp_server is not versioned, but has versioned children.  Versioned directory.
Contents conflict in document_sftp/sftp_server/SFTPServer.py
Contents conflict in document_sftp/sftp_server/SFTPServerInterface.py
Contents conflict in document_sftp/sftp_server/Server.py
Contents conflict in document_sftp/sftp_server/__init__.py
Conflict: can't delete document_webdav_old because it is not empty.  Not deleting.
Conflict because document_webdav_old is not versioned, but has versioned children.  Versioned directory.
Contents conflict in document_webdav_old/__init__.py
Contents conflict in document_webdav_old/__terp__.py
Contents conflict in document_webdav_old/document.py
Conflict: can't delete document_webdav_old/webdav because it is not empty.  Not deleting.
Conflict because document_webdav_old/webdav is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete document_webdav_old/webdav/DAV because it is not empty.  Not deleting.
Conflict because document_webdav_old/webdav/DAV is not versioned, but has versioned children.  Versioned directory.
Contents conflict in document_webdav_old/webdav/DAV/WebDAVServer.py
Contents conflict in document_webdav_old/webdav/__init__.py
Contents conflict in document_webdav_old/webdav/cache.py
Contents conflict in document_webdav_old/webdav/content_index.py
Contents conflict in document_webdav_old/webdav/dav_auth.py
Contents conflict in document_webdav_old/webdav/dav_fs.py
Contents conflict in document_webdav_old/webdav/odt2txt.py
Contents conflict in document_webdav_old/webdav/webdav_server.py
Conflict: can't delete ecommerce because it is not empty.  Not deleting.
Conflict because ecommerce is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete ecommerce/catalog because it is not empty.  Not deleting.
Conflict because ecommerce/catalog is not versioned, but has versioned children.  Versioned directory.
Contents conflict in ecommerce/catalog/__init__.py
Contents conflict in ecommerce/catalog/catalog.py
Contents conflict in ecommerce/ecommerce_demo.xml
Contents conflict in ecommerce/ecommerce_view.xml
Conflict: can't delete ecommerce/partner because it is not empty.  Not deleting.
Conflict because ecommerce/partner is not versioned, but has versioned children.  Versioned directory.
Contents conflict in ecommerce/partner/__init__.py
Contents conflict in ecommerce/partner/partner.py
Conflict: can't delete ecommerce/report because it is not empty.  Not deleting.
Conflict because ecommerce/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in ecommerce/report/__init__.py
Conflict: can't delete ecommerce/sale_order because it is not empty.  Not deleting.
Conflict because ecommerce/sale_order is not versioned, but has versioned children.  Versioned directory.
Contents conflict in ecommerce/sale_order/sale_order.py
Conflict: can't delete edi because it is not empty.  Not deleting.
Conflict because edi is not versioned, but has versioned children.  Versioned directory.
Contents conflict in edi/__init__.py
Contents conflict in edi/__terp__.py
Contents conflict in edi/edi.py
Contents conflict in edi/partner.py
Contents conflict in edi/sale_cust_price.py
Conflict: can't delete edi/wizard because it is not empty.  Not deleting.
Conflict because edi/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in edi/wizard/__init__.py
Contents conflict in edi/wizard/edi_exchange.py
Contents conflict in edi/wizard/wizard_edi_export.py
Contents conflict in edi/wizard/wizard_edi_import.py
Conflict: can't delete electronic_report_intrastat because it is not empty.  Not deleting.
Conflict because electronic_report_intrastat is not versioned, but has versioned children.  Versioned directory.
Contents conflict in electronic_report_intrastat/__init__.py
Contents conflict in electronic_report_intrastat/__terp__.py
Contents conflict in electronic_report_intrastat/report_intrastat.py
Conflict: can't delete electronic_report_intrastat/wizard because it is not empty.  Not deleting.
Conflict because electronic_report_intrastat/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in electronic_report_intrastat/wizard/__init__.py
Contents conflict in electronic_report_intrastat/wizard/wizard_intrastat_export.py
Conflict: can't delete email_account because it is not empty.  Not deleting.
Conflict because email_account is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete email_account/i18n because it is not empty.  Not deleting.
Conflict because email_account/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete email_account/wizard because it is not empty.  Not deleting.
Conflict because email_account/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in email_account/wizard/wizard_send_email.py
Conflict: can't delete email_sale because it is not empty.  Not deleting.
Conflict because email_sale is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete email_sale/i18n because it is not empty.  Not deleting.
Conflict because email_sale/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in email_sale/i18n/email_sale.pot
Conflict: can't delete email_sale/wizard because it is not empty.  Not deleting.
Conflict because email_sale/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in email_sale/wizard/wizard_send_email.py
Conflict: can't delete esale_ez because it is not empty.  Not deleting.
Conflict because esale_ez is not versioned, but has versioned children.  Versioned directory.
Contents conflict in esale_ez/__init__.py
Contents conflict in esale_ez/__terp__.py
Contents conflict in esale_ez/esale.py
Conflict: can't delete esale_joomla because it is not empty.  Not deleting.
Conflict because esale_joomla is not versioned, but has versioned children.  Versioned directory.
Contents conflict in esale_joomla/__terp__.py
Conflict: can't delete esale_joomla/connector because it is not empty.  Not deleting.
Conflict because esale_joomla/connector is not versioned, but has versioned children.  Versioned directory.
Contents conflict in esale_joomla/esale_joomla.py
Contents conflict in esale_joomla/esale_joomla_view.xml
Contents conflict in esale_joomla/esale_joomla_wizard.xml
Conflict: can't delete esale_joomla/wizard because it is not empty.  Not deleting.
Conflict because esale_joomla/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in esale_joomla/wizard/__init__.py
Contents conflict in esale_joomla/wizard/wizard_esale_import.py
Contents conflict in esale_joomla/wizard/wizard_product_stock.py
Contents conflict in esale_joomla/wizard/wizard_taxes_export.py
Conflict: can't delete esale_osc because it is not empty.  Not deleting.
Conflict because esale_osc is not versioned, but has versioned children.  Versioned directory.
Contents conflict in esale_osc/esale_oscom.py
Contents conflict in esale_osc/esale_oscom_product.py
Conflict: can't delete esale_osc/i18n because it is not empty.  Not deleting.
Conflict because esale_osc/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete esale_osc/wizard because it is not empty.  Not deleting.
Conflict because esale_osc/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in esale_osc/wizard/wizard_esale_oscom_export_products.py
Contents conflict in esale_osc/wizard/wizard_esale_oscom_export_select_products.py
Contents conflict in esale_osc/wizard/wizard_esale_oscom_update_select_stocks.py
Conflict: can't delete etl because it is not empty.  Not deleting.
Conflict because etl is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete etl/lib because it is not empty.  Not deleting.
Conflict because etl/lib is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete etl/lib/demo because it is not empty.  Not deleting.
Conflict because etl/lib/demo is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl/lib/demo/category_test.py
Contents conflict in etl/lib/demo/facebook_openerp.py
Contents conflict in etl/lib/demo/gcalendar_openerp.py
Contents conflict in etl/lib/demo/gdoc_test.py
Conflict: can't delete etl/lib/demo/input because it is not empty.  Not deleting.
Conflict because etl/lib/demo/input is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl/lib/demo/join.py
Contents conflict in etl/lib/demo/m2m_into_oo.py
Contents conflict in etl/lib/demo/map.py
Contents conflict in etl/lib/demo/openerp_facebook.py
Conflict: can't delete etl/lib/demo/salesforce_crm because it is not empty.  Not deleting.
Conflict because etl/lib/demo/salesforce_crm is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl/lib/demo/salesforce_crm/beatbox.py
Contents conflict in etl/lib/demo/salesforce_crm/demo.py
Contents conflict in etl/lib/demo/salesforce_crm/export.py
Contents conflict in etl/lib/demo/salesforce_crm/soql2atom.py
Contents conflict in etl/lib/demo/salesforce_crm/xmltramp.py
Contents conflict in etl/lib/demo/subjob.py
Contents conflict in etl/lib/demo/subjob2.py
Contents conflict in etl/lib/demo/sugercrm_openerp.py
Contents conflict in etl/lib/demo/test1.py
Contents conflict in etl/lib/demo/test2.py
Contents conflict in etl/lib/demo/test3.py
Contents conflict in etl/lib/demo/test4.py
Contents conflict in etl/lib/demo/test5.py
Contents conflict in etl/lib/demo/test_server.py
Contents conflict in etl/lib/demo/test_unique.py
Contents conflict in etl/lib/demo/test_valid.py
Contents conflict in etl/lib/demo/vcard_openobject.py
Contents conflict in etl/lib/demo/vcard_read.py
Conflict: can't delete etl/lib/demo/xml_test because it is not empty.  Not deleting.
Conflict because etl/lib/demo/xml_test is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl/lib/demo/xml_test/dicttoxml.py
Contents conflict in etl/lib/demo/xml_test/xmltodict.py
Contents conflict in etl/lib/demo/xmlrpc_in_block_example.py
Contents conflict in etl/lib/demo/xmlrpc_in_example.py
Contents conflict in etl/lib/demo/xmlrpc_out_block_example.py
Contents conflict in etl/lib/demo/xmlrpc_out_example.py
Contents conflict in etl/lib/demo/xmlrpcserver_openobject.py
Conflict: can't delete etl/lib/etl because it is not empty.  Not deleting.
Conflict because etl/lib/etl is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete etl/lib/etl/component because it is not empty.  Not deleting.
Conflict because etl/lib/etl/component is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl/lib/etl/component/component.py
Conflict: can't delete etl/lib/etl/component/control because it is not empty.  Not deleting.
Conflict because etl/lib/etl/component/control is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl/lib/etl/component/control/__init__.py
Conflict: can't delete etl/lib/etl/component/input because it is not empty.  Not deleting.
Conflict because etl/lib/etl/component/input is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl/lib/etl/component/input/__init__.py
Conflict: can't delete etl/lib/etl/component/output because it is not empty.  Not deleting.
Conflict because etl/lib/etl/component/output is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl/lib/etl/component/output/openobject_out.py
Contents conflict in etl/lib/etl/component/output/openobject_out_write.py
Conflict: can't delete etl/lib/etl/component/transform because it is not empty.  Not deleting.
Conflict because etl/lib/etl/component/transform is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl/lib/etl/component/transform/__init__.py
Contents conflict in etl/lib/etl/component/transform/data_exist.py
Contents conflict in etl/lib/etl/component/transform/logger.py
Conflict: can't delete etl/lib/etl/connector because it is not empty.  Not deleting.
Conflict because etl/lib/etl/connector is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl/lib/etl/connector/openobject_connector.py
Contents conflict in etl/lib/etl/connector/sql_connector.py
Contents conflict in etl/lib/etl/job.py
Contents conflict in etl/lib/etl/logger.py
Contents conflict in etl/lib/etl/transition.py
Conflict: can't delete etl_interface because it is not empty.  Not deleting.
Conflict because etl_interface is not versioned, but has versioned children.  Versioned directory.
Contents conflict in etl_interface/etl_interface.py
Contents conflict in etl_interface/etl_interface_demo.xml
Conflict: can't delete event_certificate because it is not empty.  Not deleting.
Conflict because event_certificate is not versioned, but has versioned children.  Versioned directory.
Contents conflict in event_certificate/__init__.py
Contents conflict in event_certificate/__openerp__.py
Contents conflict in event_certificate/event_certificate.py
Conflict: can't delete event_certificate/report because it is not empty.  Not deleting.
Conflict because event_certificate/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in event_certificate/report/__init__.py
Contents conflict in event_certificate/report/report_certificate.py
Contents conflict in event_certificate/report/rml_parse.py
Conflict: can't delete fashion because it is not empty.  Not deleting.
Conflict because fashion is not versioned, but has versioned children.  Versioned directory.
Contents conflict in fashion/__init__.py
Contents conflict in fashion/__terp__.py
Contents conflict in fashion/custom.py
Contents conflict in fashion/picture.py
Conflict: can't delete fashion/wizard because it is not empty.  Not deleting.
Conflict because fashion/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in fashion/wizard/__init__.py
Contents conflict in fashion/wizard/fashion_help_wizard.py
Conflict: can't delete flagey because it is not empty.  Not deleting.
Conflict because flagey is not versioned, but has versioned children.  Versioned directory.
Contents conflict in flagey/__init__.py
Contents conflict in flagey/__terp__.py
Conflict: can't delete fleet_maintenance because it is not empty.  Not deleting.
Conflict because fleet_maintenance is not versioned, but has versioned children.  Versioned directory.
Contents conflict in fleet_maintenance/__init__.py
Contents conflict in fleet_maintenance/__terp__.py
Contents conflict in fleet_maintenance/crm.py
Contents conflict in fleet_maintenance/invoice.py
Contents conflict in fleet_maintenance/partner.py
Contents conflict in fleet_maintenance/product.py
Contents conflict in fleet_maintenance/sale.py
Contents conflict in fleet_maintenance/stock.py
Conflict: can't delete game_scenario because it is not empty.  Not deleting.
Conflict because game_scenario is not versioned, but has versioned children.  Versioned directory.
Contents conflict in game_scenario/__init__.py
Contents conflict in game_scenario/__terp__.py
Contents conflict in game_scenario/game_scenario.py
Conflict: can't delete gnucash because it is not empty.  Not deleting.
Conflict because gnucash is not versioned, but has versioned children.  Versioned directory.
Contents conflict in gnucash/gnccontent.py
Contents conflict in gnucash/gnucash_wizard.py
Conflict: can't delete google_blogger because it is not empty.  Not deleting.
Conflict because google_blogger is not versioned, but has versioned children.  Versioned directory.
Contents conflict in google_blogger/__init__.py
Contents conflict in google_blogger/__terp__.py
Contents conflict in google_blogger/google_blogger.py
Conflict: can't delete google_blogger/wizard because it is not empty.  Not deleting.
Conflict because google_blogger/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in google_blogger/wizard/__init__.py
Contents conflict in google_blogger/wizard/create_blog_tasks.py
Conflict: can't delete google_calendar because it is not empty.  Not deleting.
Conflict because google_calendar is not versioned, but has versioned children.  Versioned directory.
Contents conflict in google_calendar/__init__.py
Contents conflict in google_calendar/__terp__.py
Contents conflict in google_calendar/google_calendar.py
Contents conflict in google_calendar/google_calendar_view.xml
Contents conflict in google_calendar/google_calendar_wizard.xml
Conflict: can't delete google_calendar/wizard because it is not empty.  Not deleting.
Conflict because google_calendar/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in google_calendar/wizard/__init__.py
Contents conflict in google_calendar/wizard/synchronize_events.py
Conflict: can't delete google_earth because it is not empty.  Not deleting.
Conflict because google_earth is not versioned, but has versioned children.  Versioned directory.
Contents conflict in google_earth/__init__.py
Contents conflict in google_earth/__terp__.py
Conflict: can't delete google_earth/document because it is not empty.  Not deleting.
Conflict because google_earth/document is not versioned, but has versioned children.  Versioned directory.
Contents conflict in google_earth/google_earth.py
Conflict: can't delete google_earth/wizard because it is not empty.  Not deleting.
Conflict because google_earth/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in google_earth/wizard/__init__.py
Contents conflict in google_earth/wizard/google_map_layer.py
Contents conflict in google_earth/wizard/google_map_open.py
Contents conflict in google_earth/wizard/google_map_turnover.py
Contents conflict in google_earth/wizard/google_route.py
Contents conflict in google_earth/wizard/goolge_network_link.py
Conflict: can't delete google_translate because it is not empty.  Not deleting.
Conflict because google_translate is not versioned, but has versioned children.  Versioned directory.
Contents conflict in google_translate/__init__.py
Contents conflict in google_translate/__terp__.py
Contents conflict in google_translate/google_translate.py
Conflict: can't delete google_translate/wizard because it is not empty.  Not deleting.
Conflict because google_translate/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in google_translate/wizard/__init__.py
Contents conflict in google_translate/wizard/term_translate.py
Conflict: can't delete health because it is not empty.  Not deleting.
Conflict because health is not versioned, but has versioned children.  Versioned directory.
Contents conflict in health/__terp__.py
Contents conflict in health/health.py
Conflict: can't delete health/report because it is not empty.  Not deleting.
Conflict because health/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in health/report/mouvementsemestriel.py
Conflict: can't delete hotel because it is not empty.  Not deleting.
Conflict because hotel is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel/__init__.py
Contents conflict in hotel/__terp__.py
Contents conflict in hotel/hotel.py
Contents conflict in hotel/hotel_view.xml
Contents conflict in hotel/hotel_wizard.xml
Conflict: can't delete hotel/report because it is not empty.  Not deleting.
Conflict because hotel/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel/report/__init__.py
Contents conflict in hotel/report/hotel_report.py
Conflict: can't delete hotel/wizard because it is not empty.  Not deleting.
Conflict because hotel/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel/wizard/__init__.py
Contents conflict in hotel/wizard/hotel_wizard.py
Conflict: can't delete hotel_housekeeping because it is not empty.  Not deleting.
Conflict because hotel_housekeeping is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel_housekeeping/__init__.py
Contents conflict in hotel_housekeeping/__terp__.py
Contents conflict in hotel_housekeeping/hotel_housekeeping.py
Contents conflict in hotel_housekeeping/hotel_housekeeping_view.xml
Contents conflict in hotel_housekeeping/hotel_housekeeping_wizard.xml
Conflict: can't delete hotel_housekeeping/report because it is not empty.  Not deleting.
Conflict because hotel_housekeeping/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel_housekeeping/report/__init__.py
Contents conflict in hotel_housekeeping/report/housekeeping_report.py
Conflict: can't delete hotel_housekeeping/wizard because it is not empty.  Not deleting.
Conflict because hotel_housekeeping/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel_housekeeping/wizard/__init__.py
Contents conflict in hotel_housekeeping/wizard/housekeeping_wizard.py
Conflict: can't delete hotel_reservation because it is not empty.  Not deleting.
Conflict because hotel_reservation is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel_reservation/__init__.py
Contents conflict in hotel_reservation/__terp__.py
Contents conflict in hotel_reservation/hotel_reservation.py
Contents conflict in hotel_reservation/hotel_reservation_view.xml
Contents conflict in hotel_reservation/hotel_reservation_wizard.xml
Conflict: can't delete hotel_reservation/report because it is not empty.  Not deleting.
Conflict because hotel_reservation/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel_reservation/report/__init__.py
Contents conflict in hotel_reservation/report/hotel_reservation_report.py
Conflict: can't delete hotel_reservation/wizard because it is not empty.  Not deleting.
Conflict because hotel_reservation/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel_reservation/wizard/__init__.py
Contents conflict in hotel_reservation/wizard/hotel_reservation_wizard.py
Conflict: can't delete hotel_restaurant because it is not empty.  Not deleting.
Conflict because hotel_restaurant is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel_restaurant/__init__.py
Contents conflict in hotel_restaurant/__terp__.py
Contents conflict in hotel_restaurant/hotel_restaurant.py
Contents conflict in hotel_restaurant/hotel_restaurant_view.xml
Contents conflict in hotel_restaurant/hotel_restaurant_wizard.xml
Conflict: can't delete hotel_restaurant/report because it is not empty.  Not deleting.
Conflict because hotel_restaurant/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel_restaurant/report/__init__.py
Contents conflict in hotel_restaurant/report/hotel_restaurant_report.py
Conflict: can't delete hotel_restaurant/wizard because it is not empty.  Not deleting.
Conflict because hotel_restaurant/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hotel_restaurant/wizard/__init__.py
Contents conflict in hotel_restaurant/wizard/hotel_restaurant_wizard.py
Conflict: can't delete hr_contract_available because it is not empty.  Not deleting.
Conflict because hr_contract_available is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_contract_available/__init__.py
Contents conflict in hr_contract_available/__terp__.py
Contents conflict in hr_contract_available/hr_contract_available.py
Contents conflict in hr_contract_available/hr_contract_available_view.xml
Conflict: can't delete hr_contract_available/security because it is not empty.  Not deleting.
Conflict because hr_contract_available/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_contract_available/security/ir.model.access.csv
Conflict: can't delete hr_contract_timesheet because it is not empty.  Not deleting.
Conflict because hr_contract_timesheet is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_contract_timesheet/__init__.py
Contents conflict in hr_contract_timesheet/__terp__.py
Contents conflict in hr_contract_timesheet/hr_contract_timesheet.py
Conflict adding file hr_evaluation.  Moved existing file to hr_evaluation.moved.
Conflict: can't delete hr_holidays_cci because it is not empty.  Not deleting.
Conflict because hr_holidays_cci is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_holidays_cci/__init__.py
Contents conflict in hr_holidays_cci/__terp__.py
Conflict: can't delete hr_holidays_cci/report because it is not empty.  Not deleting.
Conflict because hr_holidays_cci/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_holidays_cci/report/__init__.py
Contents conflict in hr_holidays_cci/report/holidays_summary_report.py
Conflict: can't delete hr_holidays_cci/wizard because it is not empty.  Not deleting.
Conflict because hr_holidays_cci/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_holidays_cci/wizard/__init__.py
Contents conflict in hr_holidays_cci/wizard/holidays_summary.py
Conflict: can't delete hr_holidays_evaluation because it is not empty.  Not deleting.
Conflict because hr_holidays_evaluation is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_holidays_evaluation/__init__.py
Contents conflict in hr_holidays_evaluation/__terp__.py
Contents conflict in hr_holidays_evaluation/hr_holidays_evaluation.py
Contents conflict in hr_holidays_evaluation/hr_holidays_evaluation_view.xml
Conflict: can't delete hr_holidays_request because it is not empty.  Not deleting.
Conflict because hr_holidays_request is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_holidays_request/__init__.py
Contents conflict in hr_holidays_request/__terp__.py
Contents conflict in hr_holidays_request/hr_holidays_request.py
Contents conflict in hr_holidays_request/hr_holidays_request_view.xml
Conflict: can't delete hr_holidays_request/report because it is not empty.  Not deleting.
Conflict because hr_holidays_request/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_holidays_request/report/__init__.py
Contents conflict in hr_holidays_request/report/hr_holiday_report.py
Contents conflict in hr_holidays_request/report/hr_holiday_report_form.py
Conflict: can't delete hr_holidays_request/wizard because it is not empty.  Not deleting.
Conflict because hr_holidays_request/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_holidays_request/wizard/__init__.py
Contents conflict in hr_holidays_request/wizard/hr_holiday.py
Conflict adding file hr_payroll.  Moved existing file to hr_payroll.moved.
Conflict: can't delete hr_performance because it is not empty.  Not deleting.
Conflict because hr_performance is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_performance/__init__.py
Contents conflict in hr_performance/__terp__.py
Contents conflict in hr_performance/hr_performance.py
Contents conflict in hr_performance/hr_performance_view.xml
Contents conflict in hr_performance/hr_performance_workflow.xml
Conflict: can't delete hr_performance/report because it is not empty.  Not deleting.
Conflict because hr_performance/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_performance/report/__init__.py
Contents conflict in hr_performance/report/hr_performance_report.py
Conflict: can't delete hr_performance/security because it is not empty.  Not deleting.
Conflict because hr_performance/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_performance/security/ir.model.access.csv
Conflict: can't delete hr_skill because it is not empty.  Not deleting.
Conflict because hr_skill is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_skill/__init__.py
Contents conflict in hr_skill/__terp__.py
Contents conflict in hr_skill/hr_skill.py
Contents conflict in hr_skill/hrskill.py
Conflict: can't delete hr_skill/report because it is not empty.  Not deleting.
Conflict because hr_skill/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_skill/report/__init__.py
Contents conflict in hr_skill/report/employeereport.py
Contents conflict in hr_skill/report/langreport.py
Contents conflict in hr_skill/report/skillreport.py
Conflict: can't delete hr_skill/security because it is not empty.  Not deleting.
Conflict because hr_skill/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_skill/security/ir.model.access.csv
Conflict: can't delete hr_skill/wizard because it is not empty.  Not deleting.
Conflict because hr_skill/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_skill/wizard/__init__.py
Contents conflict in hr_skill/wizard/datewise.py
Contents conflict in hr_skill/wizard/lang_wiz.py
Contents conflict in hr_skill/wizard/skill.py
Conflict: can't delete hr_timesheet_ical because it is not empty.  Not deleting.
Conflict because hr_timesheet_ical is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_timesheet_ical/__init__.py
Contents conflict in hr_timesheet_ical/__terp__.py
Conflict: can't delete hr_timesheet_ical/wizard because it is not empty.  Not deleting.
Conflict because hr_timesheet_ical/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in hr_timesheet_ical/wizard/__init__.py
Contents conflict in hr_timesheet_ical/wizard/urllib2.py
Contents conflict in hr_timesheet_ical/wizard/wizard_ical.py
Conflict: can't delete huissier because it is not empty.  Not deleting.
Conflict because huissier is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete huissier/barcode because it is not empty.  Not deleting.
Conflict because huissier/barcode is not versioned, but has versioned children.  Versioned directory.
Contents conflict in huissier/barcode/code128.py
Contents conflict in huissier/barcode/common.py
Contents conflict in huissier/barcode/test.py
Conflict: can't delete import_export because it is not empty.  Not deleting.
Conflict because import_export is not versioned, but has versioned children.  Versioned directory.
Contents conflict in import_export/__init__.py
Contents conflict in import_export/__terp__.py
Contents conflict in import_export/partner.py
Contents conflict in import_export/product.py
Contents conflict in import_export/purchase.py
Contents conflict in import_export/sale.py
Conflict: can't delete invoice_multi_currency because it is not empty.  Not deleting.
Conflict because invoice_multi_currency is not versioned, but has versioned children.  Versioned directory.
Contents conflict in invoice_multi_currency/__init__.py
Contents conflict in invoice_multi_currency/__terp__.py
Contents conflict in invoice_multi_currency/invoice.py
Conflict: can't delete invoice_multi_currency/wizard because it is not empty.  Not deleting.
Conflict because invoice_multi_currency/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in invoice_multi_currency/wizard/__init__.py
Contents conflict in invoice_multi_currency/wizard/wizard_change_currency.py
Conflict: can't delete invoice_sequence because it is not empty.  Not deleting.
Conflict because invoice_sequence is not versioned, but has versioned children.  Versioned directory.
Contents conflict in invoice_sequence/__init__.py
Contents conflict in invoice_sequence/__terp__.py
Contents conflict in invoice_sequence/invoice.py
Conflict: can't delete l10n_ca-qc because it is not empty.  Not deleting.
Conflict because l10n_ca-qc is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_ca-qc/__init__.py
Contents conflict in l10n_ca-qc/__terp__.py
Contents conflict in l10n_ca-qc/account_pc_canada.xml
Conflict: can't delete l10n_ch_vat_brut because it is not empty.  Not deleting.
Conflict because l10n_ch_vat_brut is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_ch_vat_brut/__init__.py
Contents conflict in l10n_ch_vat_brut/__terp__.py
Conflict: can't delete l10n_ch_vat_forfait because it is not empty.  Not deleting.
Conflict because l10n_ch_vat_forfait is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_ch_vat_forfait/__init__.py
Contents conflict in l10n_ch_vat_forfait/__terp__.py
Conflict: can't delete l10n_ch_vat_net because it is not empty.  Not deleting.
Conflict because l10n_ch_vat_net is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_ch_vat_net/__init__.py
Contents conflict in l10n_ch_vat_net/__terp__.py
Conflict: can't delete l10n_chart_at because it is not empty.  Not deleting.
Conflict because l10n_chart_at is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_at/__init__.py
Contents conflict in l10n_chart_at/__terp__.py
Conflict: can't delete l10n_chart_au because it is not empty.  Not deleting.
Conflict because l10n_chart_au is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_au/__init__.py
Contents conflict in l10n_chart_au/__terp__.py
Conflict: can't delete l10n_chart_be_frnl because it is not empty.  Not deleting.
Conflict because l10n_chart_be_frnl is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_be_frnl/__init__.py
Contents conflict in l10n_chart_be_frnl/__terp__.py
Conflict: can't delete l10n_chart_br because it is not empty.  Not deleting.
Conflict because l10n_chart_br is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_br/__init__.py
Contents conflict in l10n_chart_br/__terp__.py
Conflict: can't delete l10n_chart_ca_en because it is not empty.  Not deleting.
Conflict because l10n_chart_ca_en is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_ca_en/__init__.py
Contents conflict in l10n_chart_ca_en/__terp__.py
Conflict: can't delete l10n_chart_ca_fr because it is not empty.  Not deleting.
Conflict because l10n_chart_ca_fr is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_ca_fr/__init__.py
Contents conflict in l10n_chart_ca_fr/__terp__.py
Conflict: can't delete l10n_chart_ch_german because it is not empty.  Not deleting.
Conflict because l10n_chart_ch_german is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_ch_german/__init__.py
Contents conflict in l10n_chart_ch_german/__terp__.py
Conflict: can't delete l10n_chart_cn because it is not empty.  Not deleting.
Conflict because l10n_chart_cn is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_cn/__init__.py
Contents conflict in l10n_chart_cn/__terp__.py
Conflict: can't delete l10n_chart_cn_traditional because it is not empty.  Not deleting.
Conflict because l10n_chart_cn_traditional is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_cn_traditional/__init__.py
Contents conflict in l10n_chart_cn_traditional/__terp__.py
Conflict: can't delete l10n_chart_co because it is not empty.  Not deleting.
Conflict because l10n_chart_co is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_co/__init__.py
Contents conflict in l10n_chart_co/__terp__.py
Conflict: can't delete l10n_chart_cz because it is not empty.  Not deleting.
Conflict because l10n_chart_cz is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_cz/__init__.py
Contents conflict in l10n_chart_cz/__terp__.py
Conflict: can't delete l10n_chart_da because it is not empty.  Not deleting.
Conflict because l10n_chart_da is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_da/__init__.py
Contents conflict in l10n_chart_da/__terp__.py
Conflict: can't delete l10n_chart_de_skr03 because it is not empty.  Not deleting.
Conflict because l10n_chart_de_skr03 is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_de_skr03/__init__.py
Contents conflict in l10n_chart_de_skr03/__terp__.py
Conflict: can't delete l10n_chart_hu because it is not empty.  Not deleting.
Conflict because l10n_chart_hu is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_hu/__init__.py
Contents conflict in l10n_chart_hu/__terp__.py
Conflict: can't delete l10n_chart_in because it is not empty.  Not deleting.
Conflict because l10n_chart_in is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_in/__terp__.py
Contents conflict in l10n_chart_in/account_chart.xml
Conflict: can't delete l10n_chart_it because it is not empty.  Not deleting.
Conflict because l10n_chart_it is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_it/__init__.py
Contents conflict in l10n_chart_it/__terp__.py
Conflict: can't delete l10n_chart_it_cc2424 because it is not empty.  Not deleting.
Conflict because l10n_chart_it_cc2424 is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_it_cc2424/__init__.py
Contents conflict in l10n_chart_it_cc2424/__terp__.py
Conflict: can't delete l10n_chart_lv because it is not empty.  Not deleting.
Conflict because l10n_chart_lv is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_lv/__init__.py
Contents conflict in l10n_chart_lv/__terp__.py
Conflict: can't delete l10n_chart_nl because it is not empty.  Not deleting.
Conflict because l10n_chart_nl is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_nl/__init__.py
Contents conflict in l10n_chart_nl/__terp__.py
Conflict: can't delete l10n_chart_nl_standard because it is not empty.  Not deleting.
Conflict because l10n_chart_nl_standard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_nl_standard/__init__.py
Contents conflict in l10n_chart_nl_standard/__terp__.py
Conflict: can't delete l10n_chart_no because it is not empty.  Not deleting.
Conflict because l10n_chart_no is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_no/__init__.py
Contents conflict in l10n_chart_no/__terp__.py
Conflict: can't delete l10n_chart_pa because it is not empty.  Not deleting.
Conflict because l10n_chart_pa is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_pa/__init__.py
Contents conflict in l10n_chart_pa/__terp__.py
Conflict: can't delete l10n_chart_pl because it is not empty.  Not deleting.
Conflict because l10n_chart_pl is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_pl/__init__.py
Contents conflict in l10n_chart_pl/__terp__.py
Contents conflict in l10n_chart_pl/account_chart.xml
Contents conflict in l10n_chart_pl/account_tax.xml
Contents conflict in l10n_chart_pl/account_tax_code.xml
Conflict: can't delete l10n_chart_se because it is not empty.  Not deleting.
Conflict because l10n_chart_se is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_se/__init__.py
Contents conflict in l10n_chart_se/__terp__.py
Conflict: can't delete l10n_chart_se_church because it is not empty.  Not deleting.
Conflict because l10n_chart_se_church is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_se_church/__init__.py
Contents conflict in l10n_chart_se_church/__terp__.py
Conflict: can't delete l10n_chart_se_food because it is not empty.  Not deleting.
Conflict because l10n_chart_se_food is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_se_food/__init__.py
Contents conflict in l10n_chart_se_food/__terp__.py
Conflict: can't delete l10n_chart_uk because it is not empty.  Not deleting.
Conflict because l10n_chart_uk is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_uk/__init__.py
Contents conflict in l10n_chart_uk/__terp__.py
Conflict: can't delete l10n_chart_us_general because it is not empty.  Not deleting.
Conflict because l10n_chart_us_general is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_us_general/__init__.py
Contents conflict in l10n_chart_us_general/__terp__.py
Contents conflict in l10n_chart_us_general/account_chart.xml
Contents conflict in l10n_chart_us_general/account_tax.xml
Contents conflict in l10n_chart_us_general/account_tax_code.xml
Conflict: can't delete l10n_chart_us_manufacturing because it is not empty.  Not deleting.
Conflict because l10n_chart_us_manufacturing is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_us_manufacturing/__init__.py
Contents conflict in l10n_chart_us_manufacturing/__terp__.py
Contents conflict in l10n_chart_us_manufacturing/account_chart.xml
Contents conflict in l10n_chart_us_manufacturing/account_tax.xml
Contents conflict in l10n_chart_us_manufacturing/account_tax_code.xml
Contents conflict in l10n_chart_us_manufacturing/l10n_us_wizard.xml
Conflict: can't delete l10n_chart_us_service because it is not empty.  Not deleting.
Conflict because l10n_chart_us_service is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_us_service/__init__.py
Contents conflict in l10n_chart_us_service/__terp__.py
Contents conflict in l10n_chart_us_service/account_chart.xml
Contents conflict in l10n_chart_us_service/account_tax.xml
Contents conflict in l10n_chart_us_service/account_tax_code.xml
Contents conflict in l10n_chart_us_service/l10n_us_wizard.xml
Conflict: can't delete l10n_chart_us_ucoa because it is not empty.  Not deleting.
Conflict because l10n_chart_us_ucoa is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_us_ucoa/__init__.py
Contents conflict in l10n_chart_us_ucoa/__terp__.py
Contents conflict in l10n_chart_us_ucoa/account_chart.xml
Contents conflict in l10n_chart_us_ucoa/account_tax.xml
Contents conflict in l10n_chart_us_ucoa/account_tax_code.xml
Conflict: can't delete l10n_chart_us_ucoa_ez because it is not empty.  Not deleting.
Conflict because l10n_chart_us_ucoa_ez is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_us_ucoa_ez/__init__.py
Contents conflict in l10n_chart_us_ucoa_ez/__terp__.py
Contents conflict in l10n_chart_us_ucoa_ez/account_chart.xml
Contents conflict in l10n_chart_us_ucoa_ez/account_tax.xml
Contents conflict in l10n_chart_us_ucoa_ez/account_tax_code.xml
Conflict: can't delete l10n_chart_ve because it is not empty.  Not deleting.
Conflict because l10n_chart_ve is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_chart_ve/__init__.py
Contents conflict in l10n_chart_ve/__terp__.py
Conflict: can't delete l10n_fr_account_generation because it is not empty.  Not deleting.
Conflict because l10n_fr_account_generation is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete l10n_fr_account_generation/i18n because it is not empty.  Not deleting.
Conflict because l10n_fr_account_generation/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_fr_account_generation/partner.py
Conflict: can't delete l10n_fr_export because it is not empty.  Not deleting.
Conflict because l10n_fr_export is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete l10n_fr_export/i18n because it is not empty.  Not deleting.
Conflict because l10n_fr_export/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete l10n_fr_pcg because it is not empty.  Not deleting.
Conflict because l10n_fr_pcg is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete l10n_fr_tva_franchise because it is not empty.  Not deleting.
Conflict because l10n_fr_tva_franchise is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete l10n_fr_tva_reel because it is not empty.  Not deleting.
Conflict because l10n_fr_tva_reel is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete l10n_ma.moved because it is not empty.  Not deleting.
Conflict adding file l10n_ma.  Moved existing file to l10n_ma.moved.
Conflict because l10n_ma.moved is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_ma.moved/__init__.py
Contents conflict in l10n_ma.moved/__terp__.py
Conflict: can't delete l10n_simple because it is not empty.  Not deleting.
Conflict because l10n_simple is not versioned, but has versioned children.  Versioned directory.
Contents conflict in l10n_simple/__init__.py
Contents conflict in l10n_simple/__terp__.py
Contents conflict in l10n_simple/tax_configure_wiz.py
Conflict: can't delete label because it is not empty.  Not deleting.
Conflict because label is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete label/i18n because it is not empty.  Not deleting.
Conflict because label/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in label/report_label_view.xml
Conflict: can't delete labo_analysis because it is not empty.  Not deleting.
Conflict because labo_analysis is not versioned, but has versioned children.  Versioned directory.
Contents conflict in labo_analysis/__terp__.py
Contents conflict in labo_analysis/labo_analysis.py
Conflict: can't delete labo_analysis/report because it is not empty.  Not deleting.
Conflict because labo_analysis/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in labo_analysis/report/__init__.py
Contents conflict in labo_analysis/report/invoice.py
Contents conflict in labo_analysis/report/labo_request_report.py
Contents conflict in labo_analysis/report/report_dna.py
Contents conflict in labo_analysis/report/report_followsheet_of_sample.py
Contents conflict in labo_analysis/report/report_scid_2007_0276.py
Contents conflict in labo_analysis/report/report_scrapie_2007.py
Contents conflict in labo_analysis/report/report_setup.py
Contents conflict in labo_analysis/report/report_stress_2007_0649.py
Path conflict: labo_analysis/table_conversion_empdog_chiffre_lettre.csv / <deleted>
Conflict: can't delete labo_analysis/wizard because it is not empty.  Not deleting.
Conflict because labo_analysis/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in labo_analysis/wizard/__init__.py
Contents conflict in labo_analysis/wizard/wizard_allsetting.py
Contents conflict in labo_analysis/wizard/wizard_analysiis_import_xls.py
Contents conflict in labo_analysis/wizard/wizard_import_resdog.py
Contents conflict in labo_analysis/wizard/wizard_repeat_line.py
Contents conflict in labo_analysis/wizard/wizard_setup.py
Conflict: can't delete labo_stock because it is not empty.  Not deleting.
Conflict because labo_stock is not versioned, but has versioned children.  Versioned directory.
Contents conflict in labo_stock/__terp__.py
Conflict: can't delete labo_stock/report because it is not empty.  Not deleting.
Conflict because labo_stock/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in labo_stock/report/__init__.py
Contents conflict in labo_stock/report/report_composition_mix.py
Conflict: can't delete labo_stock/wizard because it is not empty.  Not deleting.
Conflict because labo_stock/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in labo_stock/wizard/wizard_invoice_article.py
Conflict: can't delete library because it is not empty.  Not deleting.
Conflict because library is not versioned, but has versioned children.  Versioned directory.
Contents conflict in library/__init__.py
Contents conflict in library/__openerp__.py
Contents conflict in library/account.py
Conflict: can't delete library/i18n because it is not empty.  Not deleting.
Conflict because library/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in library/i18n/fr_FR.po
Contents conflict in library/library.py
Contents conflict in library/library_data.xml
Contents conflict in library/library_editor_supplier.py
Contents conflict in library/library_view.xml
Contents conflict in library/library_wizard.xml
Contents conflict in library/mrp.py
Contents conflict in library/product.py
Contents conflict in library/purchase.py
Contents conflict in library/sale.py
Contents conflict in library/stock.py
Conflict: can't delete library/wizard because it is not empty.  Not deleting.
Conflict because library/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in library/wizard/__init__.py
Contents conflict in library/wizard/wizard_update_prices.py
Conflict: can't delete loan because it is not empty.  Not deleting.
Conflict because loan is not versioned, but has versioned children.  Versioned directory.
Contents conflict in loan/__init__.py
Contents conflict in loan/__terp__.py
Contents conflict in loan/cheque.py
Contents conflict in loan/cheque_workflow.xml
Contents conflict in loan/installment.py
Contents conflict in loan/loan.py
Contents conflict in loan/loan_proof.py
Contents conflict in loan/loan_view.xml
Contents conflict in loan/loan_wizard.xml
Contents conflict in loan/loan_workflow.xml
Contents conflict in loan/loantype.py
Contents conflict in loan/loantype_view.xml
Conflict: can't delete loan/report because it is not empty.  Not deleting.
Conflict because loan/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in loan/report/__init__.py
Contents conflict in loan/report/loan_details.py
Contents conflict in loan/report/loan_paper.py
Contents conflict in loan/report/partner_loan.py
Conflict: can't delete loan/wizard because it is not empty.  Not deleting.
Conflict because loan/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in loan/wizard/__init__.py
Contents conflict in loan/wizard/wizard_cheque_state_process.py
Contents conflict in loan/wizard/wizard_create_account.py
Contents conflict in loan/wizard/wizard_partner_loan_report.py
Conflict: can't delete lunch.moved because it is not empty.  Not deleting.
Conflict adding file lunch.  Moved existing file to lunch.moved.
Conflict because lunch.moved is not versioned, but has versioned children.  Versioned directory.
Contents conflict in lunch.moved/__init__.py
Contents conflict in lunch.moved/__terp__.py
Contents conflict in lunch.moved/lunch.py
Conflict: can't delete lunch.moved/report because it is not empty.  Not deleting.
Conflict because lunch.moved/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in lunch.moved/report/__init__.py
Contents conflict in lunch.moved/report/order.py
Conflict: can't delete lunch.moved/wizard because it is not empty.  Not deleting.
Conflict because lunch.moved/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in lunch.moved/wizard/__init__.py
Contents conflict in lunch.moved/wizard/cancel.py
Contents conflict in lunch.moved/wizard/confirm.py
Contents conflict in lunch.moved/wizard/reset_box.py
Conflict: can't delete magento_openerp_synchro because it is not empty.  Not deleting.
Conflict because magento_openerp_synchro is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete magento_openerp_synchro/i18n because it is not empty.  Not deleting.
Conflict because magento_openerp_synchro/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in magento_openerp_synchro/magento.py
Contents conflict in magento_openerp_synchro/magento_utils.py
Contents conflict in magento_openerp_synchro/product.py
Conflict: can't delete magento_openerp_synchro/wizard because it is not empty.  Not deleting.
Conflict because magento_openerp_synchro/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in magento_openerp_synchro/wizard/__init__.py
Contents conflict in magento_openerp_synchro/wizard/magento_category_synchronize.py
Contents conflict in magento_openerp_synchro/wizard/magento_product_synchronize.py
Contents conflict in magento_openerp_synchro/wizard/magento_so_correct.py
Contents conflict in magento_openerp_synchro/wizard/magento_so_import.py
Contents conflict in magento_openerp_synchro/wizard/magento_so_update.py
Conflict: can't delete maintenance_editor because it is not empty.  Not deleting.
Conflict because maintenance_editor is not versioned, but has versioned children.  Versioned directory.
Contents conflict in maintenance_editor/__terp__.py
Contents conflict in maintenance_editor/maintenance_editor.py
Contents conflict in maintenance_editor/maintenance_editor_view.xml
Contents conflict in maintenance_editor/maintenance_report.xml
Conflict: can't delete maintenance_editor/report because it is not empty.  Not deleting.
Conflict because maintenance_editor/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in maintenance_editor/report/__init__.py
Conflict: can't delete marketing.moved because it is not empty.  Not deleting.
Conflict adding file marketing.  Moved existing file to marketing.moved.
Conflict because marketing.moved is not versioned, but has versioned children.  Versioned directory.
Contents conflict in marketing.moved/__init__.py
Contents conflict in marketing.moved/__terp__.py
Conflict: can't delete marketing.moved/campaign because it is not empty.  Not deleting.
Conflict because marketing.moved/campaign is not versioned, but has versioned children.  Versioned directory.
Contents conflict in marketing.moved/campaign/__init__.py
Contents conflict in marketing.moved/campaign/campaign.py
Conflict: can't delete marketing.moved/campaign/wizard because it is not empty.  Not deleting.
Conflict because marketing.moved/campaign/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in marketing.moved/campaign/wizard/__init__.py
Contents conflict in marketing.moved/campaign/wizard/wizard_campaign_email.py
Contents conflict in marketing.moved/campaign/wizard/wizard_campaign_partner_add.py
Conflict: can't delete md_hr_contract because it is not empty.  Not deleting.
Conflict because md_hr_contract is not versioned, but has versioned children.  Versioned directory.
Contents conflict in md_hr_contract/__init__.py
Contents conflict in md_hr_contract/__terp__.py
Contents conflict in md_hr_contract/md_hr_contract.py
Contents conflict in md_hr_contract/md_hr_contract_view.xml
Conflict: can't delete md_hr_course because it is not empty.  Not deleting.
Conflict because md_hr_course is not versioned, but has versioned children.  Versioned directory.
Contents conflict in md_hr_course/__init__.py
Contents conflict in md_hr_course/__terp__.py
Contents conflict in md_hr_course/md_hr_course.py
Conflict: can't delete md_hr_employee because it is not empty.  Not deleting.
Conflict because md_hr_employee is not versioned, but has versioned children.  Versioned directory.
Contents conflict in md_hr_employee/__init__.py
Contents conflict in md_hr_employee/__terp__.py
Contents conflict in md_hr_employee/md_hr_employee.py
Contents conflict in md_hr_employee/md_hr_employee_data.xml
Conflict: can't delete membership_card because it is not empty.  Not deleting.
Conflict because membership_card is not versioned, but has versioned children.  Versioned directory.
Contents conflict in membership_card/__init__.py
Conflict: can't delete membership_card/i18n because it is not empty.  Not deleting.
Conflict because membership_card/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in membership_card/membership_card.py
Conflict: can't delete membership_card/report because it is not empty.  Not deleting.
Conflict because membership_card/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in membership_card/report/__init__.py
Contents conflict in membership_card/report/membership_card_report.py
Conflict: can't delete merge_picking because it is not empty.  Not deleting.
Conflict because merge_picking is not versioned, but has versioned children.  Versioned directory.
Contents conflict in merge_picking/__init__.py
Contents conflict in merge_picking/__terp__.py
Conflict: can't delete merge_picking/wizard because it is not empty.  Not deleting.
Conflict because merge_picking/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in merge_picking/wizard/__init__.py
Contents conflict in merge_picking/wizard/merge_picking.py
Conflict: can't delete mrp_bom_customization because it is not empty.  Not deleting.
Conflict because mrp_bom_customization is not versioned, but has versioned children.  Versioned directory.
Contents conflict in mrp_bom_customization/configurator_wizard.py
Conflict: can't delete mrp_bom_customization/i18n because it is not empty.  Not deleting.
Conflict because mrp_bom_customization/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in mrp_bom_customization/stock.py
Conflict: can't delete mrp_production_report because it is not empty.  Not deleting.
Conflict because mrp_production_report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in mrp_production_report/__init__.py
Contents conflict in mrp_production_report/__terp__.py
Contents conflict in mrp_production_report/mrp.py
Conflict: can't delete mrp_production_report/report because it is not empty.  Not deleting.
Conflict because mrp_production_report/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in mrp_production_report/report/__init__.py
Contents conflict in mrp_production_report/report/order.py
Conflict: can't delete mrp_state because it is not empty.  Not deleting.
Conflict because mrp_state is not versioned, but has versioned children.  Versioned directory.
Contents conflict in mrp_state/__init__.py
Contents conflict in mrp_state/__terp__.py
Contents conflict in mrp_state/mrp.py
Conflict: can't delete multi_company.moved because it is not empty.  Not deleting.
Conflict adding file multi_company.  Moved existing file to multi_company.moved.
Conflict because multi_company.moved is not versioned, but has versioned children.  Versioned directory.
Contents conflict in multi_company.moved/__init__.py
Contents conflict in multi_company.moved/__terp__.py
Conflict: can't delete multi_company.moved/i18n because it is not empty.  Not deleting.
Conflict because multi_company.moved/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in multi_company.moved/i18n/pt_BR.po
Contents conflict in multi_company.moved/i18n/zh_CN.po
Contents conflict in multi_company.moved/i18n/zh_TW.po
Conflict: can't delete multi_company_account because it is not empty.  Not deleting.
Conflict because multi_company_account is not versioned, but has versioned children.  Versioned directory.
Contents conflict in multi_company_account/__init__.py
Contents conflict in multi_company_account/__terp__.py
Conflict: can't delete multi_company_account/i18n because it is not empty.  Not deleting.
Conflict because multi_company_account/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in multi_company_account/i18n/pt_BR.po
Contents conflict in multi_company_account/i18n/zh_CN.po
Contents conflict in multi_company_account/i18n/zh_TW.po
Contents conflict in multi_company_account/multi_company_account.py
Conflict: can't delete multi_company_account/wizard because it is not empty.  Not deleting.
Conflict because multi_company_account/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in multi_company_account/wizard/__init__.py
Contents conflict in multi_company_account/wizard/company_header_footer_setup.py
Contents conflict in multi_company_account/wizard/wizard_journal.py
Conflict: can't delete multi_company_currency because it is not empty.  Not deleting.
Conflict because multi_company_currency is not versioned, but has versioned children.  Versioned directory.
Contents conflict in multi_company_currency/__init__.py
Contents conflict in multi_company_currency/__terp__.py
Contents conflict in multi_company_currency/multi_currency.py
Conflict: can't delete multi_company_hr_timesheet_sheet because it is not empty.  Not deleting.
Conflict because multi_company_hr_timesheet_sheet is not versioned, but has versioned children.  Versioned directory.
Contents conflict in multi_company_hr_timesheet_sheet/__init__.py
Contents conflict in multi_company_hr_timesheet_sheet/__terp__.py
Contents conflict in multi_company_hr_timesheet_sheet/multi_company_hr_timesheet_sheet.py
Conflict: can't delete multi_company_product because it is not empty.  Not deleting.
Conflict because multi_company_product is not versioned, but has versioned children.  Versioned directory.
Contents conflict in multi_company_product/__init__.py
Contents conflict in multi_company_product/__terp__.py
Contents conflict in multi_company_product/product.py
Conflict: can't delete multi_company_project because it is not empty.  Not deleting.
Conflict because multi_company_project is not versioned, but has versioned children.  Versioned directory.
Contents conflict in multi_company_project/__init__.py
Contents conflict in multi_company_project/__terp__.py
Contents conflict in multi_company_project/multi_company_project.py
Conflict: can't delete multi_company_sequence because it is not empty.  Not deleting.
Conflict because multi_company_sequence is not versioned, but has versioned children.  Versioned directory.
Contents conflict in multi_company_sequence/__init__.py
Contents conflict in multi_company_sequence/__terp__.py
Contents conflict in multi_company_sequence/multi_company_sequence.py
Conflict: can't delete multi_company_stock because it is not empty.  Not deleting.
Conflict because multi_company_stock is not versioned, but has versioned children.  Versioned directory.
Contents conflict in multi_company_stock/__init__.py
Contents conflict in multi_company_stock/__terp__.py
Contents conflict in multi_company_stock/multi_company_stock.py
Conflict: can't delete multilogin_portal because it is not empty.  Not deleting.
Conflict because multilogin_portal is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete network because it is not empty.  Not deleting.
Conflict because network is not versioned, but has versioned children.  Versioned directory.
Contents conflict in network/__init__.py
Conflict: can't delete network/i18n because it is not empty.  Not deleting.
Conflict because network/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in network/i18n/network.pot
Contents conflict in network/network.py
Contents conflict in network/network_demo.xml
Contents conflict in network/network_report.xml
Contents conflict in network/network_view.xml
Conflict: can't delete network/security because it is not empty.  Not deleting.
Conflict because network/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in network/security/ir.model.access.csv
Contents conflict in network/security/network_security.xml
Conflict: can't delete network_extension because it is not empty.  Not deleting.
Conflict because network_extension is not versioned, but has versioned children.  Versioned directory.
Contents conflict in network_extension/__init__.py
Conflict: can't delete network_extension/i18n because it is not empty.  Not deleting.
Conflict because network_extension/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in network_extension/i18n/network_extension.pot
Contents conflict in network_extension/network.py
Contents conflict in network_extension/network_protocol_data.xml
Contents conflict in network_extension/network_view.xml
Conflict: can't delete network_extension/security because it is not empty.  Not deleting.
Conflict because network_extension/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in network_extension/security/ir.model.access.csv
Conflict: can't delete olap because it is not empty.  Not deleting.
Conflict because olap is not versioned, but has versioned children.  Versioned directory.
Contents conflict in olap/__terp__.py
Conflict: can't delete olap/cube because it is not empty.  Not deleting.
Conflict because olap/cube is not versioned, but has versioned children.  Versioned directory.
Contents conflict in olap/cube/level.py
Contents conflict in olap/cube/warehouse.py
Conflict: can't delete olap_crm because it is not empty.  Not deleting.
Conflict because olap_crm is not versioned, but has versioned children.  Versioned directory.
Contents conflict in olap_crm/__init__.py
Contents conflict in olap_crm/__terp__.py
Conflict: can't delete olap_extract because it is not empty.  Not deleting.
Conflict because olap_extract is not versioned, but has versioned children.  Versioned directory.
Contents conflict in olap_extract/__init__.py
Contents conflict in olap_extract/__terp__.py
Contents conflict in olap_extract/wizard_olap_extract.py
Conflict: can't delete olap_sale because it is not empty.  Not deleting.
Conflict because olap_sale is not versioned, but has versioned children.  Versioned directory.
Contents conflict in olap_sale/__init__.py
Contents conflict in olap_sale/__terp__.py
Conflict: can't delete openerp_dia because it is not empty.  Not deleting.
Path conflict: openerp_dia / <deleted>
Conflict because openerp_dia is not versioned, but has versioned children.  Versioned directory.
Contents conflict in openerp_dia/codegen_openerp.py
Conflict: can't delete partner_informations because it is not empty.  Not deleting.
Conflict because partner_informations is not versioned, but has versioned children.  Versioned directory.
Contents conflict in partner_informations/__init__.py
Contents conflict in partner_informations/__terp__.py
Conflict: can't delete partner_informations/i18n because it is not empty.  Not deleting.
Conflict because partner_informations/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in partner_informations/partner_informations.py
Conflict: can't delete partner_layout because it is not empty.  Not deleting.
Conflict because partner_layout is not versioned, but has versioned children.  Versioned directory.
Contents conflict in partner_layout/__init__.py
Contents conflict in partner_layout/__terp__.py
Contents conflict in partner_layout/partner_layout.py
Conflict: can't delete partner_ldap because it is not empty.  Not deleting.
Conflict because partner_ldap is not versioned, but has versioned children.  Versioned directory.
Contents conflict in partner_ldap/__init__.py
Contents conflict in partner_ldap/__terp__.py
Contents conflict in partner_ldap/partner.py
Conflict: can't delete partner_ldap/wizard because it is not empty.  Not deleting.
Conflict because partner_ldap/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in partner_ldap/wizard/__init__.py
Contents conflict in partner_ldap/wizard/synchronize.py
Conflict: can't delete partner_nace because it is not empty.  Not deleting.
Conflict because partner_nace is not versioned, but has versioned children.  Versioned directory.
Contents conflict in partner_nace/__init__.py
Contents conflict in partner_nace/__terp__.py
Conflict: can't delete partner_nace/i18n because it is not empty.  Not deleting.
Conflict because partner_nace/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete partner_spam because it is not empty.  Not deleting.
Conflict because partner_spam is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete partner_spam/i18n because it is not empty.  Not deleting.
Conflict because partner_spam/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete partner_spam/wizard because it is not empty.  Not deleting.
Conflict because partner_spam/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in partner_spam/wizard/wizard_spam.py
Conflict: can't delete personal_base because it is not empty.  Not deleting.
Conflict because personal_base is not versioned, but has versioned children.  Versioned directory.
Contents conflict in personal_base/account.py
Contents conflict in personal_base/personal_base.csv
Conflict adding file point_of_sale.  Moved existing file to point_of_sale.moved.
Conflict: can't delete portal because it is not empty.  Not deleting.
Conflict because portal is not versioned, but has versioned children.  Versioned directory.
Contents conflict in portal/__init__.py
Contents conflict in portal/__terp__.py
Conflict: can't delete portal/i18n because it is not empty.  Not deleting.
Conflict because portal/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in portal/i18n/pt_BR.po
Contents conflict in portal/i18n/zh_CN.po
Contents conflict in portal/i18n/zh_TW.po
Contents conflict in portal/portal.py
Contents conflict in portal/portal_view.xml
Conflict: can't delete portal/wizard because it is not empty.  Not deleting.
Conflict because portal/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in portal/wizard/__init__.py
Contents conflict in portal/wizard/create_menu.py
Contents conflict in portal/wizard/create_user.py
Conflict: can't delete portal_account because it is not empty.  Not deleting.
Conflict because portal_account is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete portal_analytic because it is not empty.  Not deleting.
Conflict because portal_analytic is not versioned, but has versioned children.  Versioned directory.
Contents conflict in portal_analytic/__init__.py
Contents conflict in portal_analytic/portal_analytic_view.xml
Conflict: can't delete portal_analytic_package because it is not empty.  Not deleting.
Conflict because portal_analytic_package is not versioned, but has versioned children.  Versioned directory.
Contents conflict in portal_analytic_package/__terp__.py
Conflict: can't delete portal_project because it is not empty.  Not deleting.
Conflict because portal_project is not versioned, but has versioned children.  Versioned directory.
Contents conflict in portal_project/__terp__.py
Contents conflict in portal_project/portal_project.py
Contents conflict in portal_project/portal_project_data.xml
Contents conflict in portal_project/portal_project_view.xml
Conflict: can't delete portal_project/wizard because it is not empty.  Not deleting.
Conflict because portal_project/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in portal_project/wizard/wizard_check_section.py
Conflict: can't delete portal_sale because it is not empty.  Not deleting.
Conflict because portal_sale is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete portal_service because it is not empty.  Not deleting.
Conflict because portal_service is not versioned, but has versioned children.  Versioned directory.
Contents conflict in portal_service/__init__.py
Contents conflict in portal_service/scrum.py
Conflict: can't delete portal_service/wizard because it is not empty.  Not deleting.
Conflict because portal_service/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in portal_service/wizard/__init__.py
Contents conflict in portal_service/wizard/case_get_open.py
Conflict: can't delete portal_training because it is not empty.  Not deleting.
Conflict because portal_training is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete product_catalog_report because it is not empty.  Not deleting.
Conflict because product_catalog_report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_catalog_report/__init__.py
Contents conflict in product_catalog_report/__openerp__.py
Conflict: can't delete product_catalog_report/report because it is not empty.  Not deleting.
Conflict because product_catalog_report/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_catalog_report/report/__init__.py
Contents conflict in product_catalog_report/report/product_catalog.py
Contents conflict in product_catalog_report/report/product_catalog.rml
Conflict: can't delete product_catalog_report/wizard because it is not empty.  Not deleting.
Conflict because product_catalog_report/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_catalog_report/wizard/__init__.py
Contents conflict in product_catalog_report/wizard/wizard_product_catalog.py
Conflict: can't delete product_electronic because it is not empty.  Not deleting.
Conflict because product_electronic is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_electronic/__init__.py
Contents conflict in product_electronic/__terp__.py
Contents conflict in product_electronic/product_electronic.py
Contents conflict in product_electronic/product_electronic_view.xml
Conflict: can't delete product_expiry.moved because it is not empty.  Not deleting.
Conflict adding file product_expiry.  Moved existing file to product_expiry.moved.
Conflict because product_expiry.moved is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_expiry.moved/__init__.py
Contents conflict in product_expiry.moved/__terp__.py
Contents conflict in product_expiry.moved/product_expiry.py
Contents conflict in product_expiry.moved/product_expiry_demo.xml
Contents conflict in product_expiry.moved/product_expiry_view.xml
Conflict: can't delete product_extended because it is not empty.  Not deleting.
Conflict because product_extended is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_extended/__init__.py
Contents conflict in product_extended/__openerp__.py
Conflict: can't delete product_extended/i18n because it is not empty.  Not deleting.
Conflict because product_extended/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_extended/mrp_view.xml
Contents conflict in product_extended/product_extended.py
Contents conflict in product_extended/product_extended_view.xml
Conflict: can't delete product_extended/wizard because it is not empty.  Not deleting.
Conflict because product_extended/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_extended/wizard/wizard_price.py
Conflict: can't delete product_gtin because it is not empty.  Not deleting.
Conflict because product_gtin is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_gtin/__terp__.py
Conflict: can't delete product_index because it is not empty.  Not deleting.
Conflict because product_index is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_index/__init__.py
Contents conflict in product_index/__terp__.py
Contents conflict in product_index/product_index.py
Conflict: can't delete product_listprice_upgrade because it is not empty.  Not deleting.
Conflict because product_listprice_upgrade is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_listprice_upgrade/__init__.py
Contents conflict in product_listprice_upgrade/__terp__.py
Contents conflict in product_listprice_upgrade/product_wizard.xml
Conflict: can't delete product_listprice_upgrade/wizard because it is not empty.  Not deleting.
Conflict because product_listprice_upgrade/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_listprice_upgrade/wizard/__init__.py
Contents conflict in product_listprice_upgrade/wizard/wizard_product_listprice.py
Conflict: can't delete product_lot_foundry because it is not empty.  Not deleting.
Conflict because product_lot_foundry is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_lot_foundry/__init__.py
Contents conflict in product_lot_foundry/__terp__.py
Contents conflict in product_lot_foundry/product_lot_foundry.py
Contents conflict in product_lot_foundry/purchase_auto.py
Conflict: can't delete product_m2mcategories because it is not empty.  Not deleting.
Conflict because product_m2mcategories is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_m2mcategories/product.py
Conflict: can't delete product_qt because it is not empty.  Not deleting.
Conflict because product_qt is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_qt/__terp__.py
Conflict: can't delete product_search_reference because it is not empty.  Not deleting.
Conflict because product_search_reference is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_search_reference/__init__.py
Contents conflict in product_search_reference/__terp__.py
Contents conflict in product_search_reference/product.py
Conflict: can't delete product_serial because it is not empty.  Not deleting.
Path conflict: product_serial / <deleted>
Conflict because product_serial is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_serial/__init__.py
Contents conflict in product_serial/__openerp__.py
Contents conflict in product_serial/product.py
Contents conflict in product_serial/product_view.xml
Contents conflict in product_serial/stock.py
Contents conflict in product_serial/stock_view.xml
Conflict: can't delete product_series because it is not empty.  Not deleting.
Conflict because product_series is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete product_size because it is not empty.  Not deleting.
Conflict because product_size is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_size/__init__.py
Contents conflict in product_size/__terp__.py
Contents conflict in product_size/product_size.py
Conflict: can't delete product_variant_configurator because it is not empty.  Not deleting.
Conflict because product_variant_configurator is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete product_variant_configurator/i18n because it is not empty.  Not deleting.
Conflict because product_variant_configurator/i18n is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete product_variant_multi because it is not empty.  Not deleting.
Conflict because product_variant_multi is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_variant_multi/demo_data.xml
Conflict: can't delete product_variant_multi/i18n because it is not empty.  Not deleting.
Conflict because product_variant_multi/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_variant_multi/i18n/product_variant_multi.pot
Contents conflict in product_variant_multi/product_variant.py
Contents conflict in product_variant_multi/product_view.xml
Conflict: can't delete product_variant_multi/security because it is not empty.  Not deleting.
Conflict because product_variant_multi/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in product_variant_multi/security/ir.model.access.csv
Conflict adding file product_visible_discount.  Moved existing file to product_visible_discount.moved.
Conflict: can't delete productivity_analysis because it is not empty.  Not deleting.
Conflict because productivity_analysis is not versioned, but has versioned children.  Versioned directory.
Contents conflict in productivity_analysis/__init__.py
Contents conflict in productivity_analysis/__terp__.py
Contents conflict in productivity_analysis/productivity_analysis.py
Conflict: can't delete productivity_analysis/report because it is not empty.  Not deleting.
Conflict because productivity_analysis/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in productivity_analysis/report/__init__.py
Contents conflict in productivity_analysis/report/productivity_analysis.py
Conflict: can't delete productivity_analysis/wizard because it is not empty.  Not deleting.
Conflict because productivity_analysis/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in productivity_analysis/wizard/__init__.py
Contents conflict in productivity_analysis/wizard/wizard_pa_report.py
Conflict: can't delete profile_account_india because it is not empty.  Not deleting.
Conflict because profile_account_india is not versioned, but has versioned children.  Versioned directory.
Contents conflict in profile_account_india/__init__.py
Contents conflict in profile_account_india/__terp__.py
Conflict: can't delete profile_ampco because it is not empty.  Not deleting.
Conflict because profile_ampco is not versioned, but has versioned children.  Versioned directory.
Contents conflict in profile_ampco/__init__.py
Contents conflict in profile_ampco/__terp__.py
Conflict: can't delete profile_bi because it is not empty.  Not deleting.
Conflict because profile_bi is not versioned, but has versioned children.  Versioned directory.
Contents conflict in profile_bi/__init__.py
Contents conflict in profile_bi/__terp__.py
Conflict: can't delete profile_bookstore because it is not empty.  Not deleting.
Conflict because profile_bookstore is not versioned, but has versioned children.  Versioned directory.
Contents conflict in profile_bookstore/__init__.py
Contents conflict in profile_bookstore/__terp__.py
Conflict: can't delete profile_business_game because it is not empty.  Not deleting.
Conflict because profile_business_game is not versioned, but has versioned children.  Versioned directory.
Contents conflict in profile_business_game/__terp__.py
Contents conflict in profile_business_game/profile_game_config.xml
Contents conflict in profile_business_game/profile_game_data.xml
Conflict: can't delete profile_cci because it is not empty.  Not deleting.
Conflict because profile_cci is not versioned, but has versioned children.  Versioned directory.
Contents conflict in profile_cci/__init__.py
Contents conflict in profile_cci/__terp__.py
Conflict: can't delete profile_dm because it is not empty.  Not deleting.
Conflict because profile_dm is not versioned, but has versioned children.  Versioned directory.
Contents conflict in profile_dm/__terp__.py
Conflict: can't delete profile_hotel because it is not empty.  Not deleting.
Conflict because profile_hotel is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete profile_training because it is not empty.  Not deleting.
Conflict because profile_training is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete proforma_followup because it is not empty.  Not deleting.
Conflict because proforma_followup is not versioned, but has versioned children.  Versioned directory.
Contents conflict in proforma_followup/proforma.py
Conflict: can't delete project_contact because it is not empty.  Not deleting.
Conflict because project_contact is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete project_crm because it is not empty.  Not deleting.
Conflict because project_crm is not versioned, but has versioned children.  Versioned directory.
Contents conflict in project_crm/__terp__.py
Contents conflict in project_crm/project_crm.py
Conflict: can't delete project_event because it is not empty.  Not deleting.
Conflict because project_event is not versioned, but has versioned children.  Versioned directory.
Contents conflict in project_event/project_event.py
Conflict: can't delete project_idea because it is not empty.  Not deleting.
Conflict because project_idea is not versioned, but has versioned children.  Versioned directory.
Contents conflict in project_idea/__terp__.py
Conflict: can't delete project_timesheet_contract because it is not empty.  Not deleting.
Conflict because project_timesheet_contract is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete project_timesheet_contract/hr because it is not empty.  Not deleting.
Conflict because project_timesheet_contract/hr is not versioned, but has versioned children.  Versioned directory.
Contents conflict in project_timesheet_contract/hr/hr_employee.py
Conflict: can't delete purchase_approve because it is not empty.  Not deleting.
Conflict because purchase_approve is not versioned, but has versioned children.  Versioned directory.
Contents conflict in purchase_approve/__init__.py
Contents conflict in purchase_approve/__terp__.py
Conflict: can't delete purchase_confirm because it is not empty.  Not deleting.
Conflict because purchase_confirm is not versioned, but has versioned children.  Versioned directory.
Contents conflict in purchase_confirm/__init__.py
Contents conflict in purchase_confirm/__terp__.py
Conflict: can't delete purchase_confirm/wizard because it is not empty.  Not deleting.
Conflict because purchase_confirm/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in purchase_confirm/wizard/__init__.py
Contents conflict in purchase_confirm/wizard/po_confirm.py
Conflict: can't delete purchase_delivery because it is not empty.  Not deleting.
Conflict because purchase_delivery is not versioned, but has versioned children.  Versioned directory.
Contents conflict in purchase_delivery/__init__.py
Contents conflict in purchase_delivery/__terp__.py
Contents conflict in purchase_delivery/delivery.py
Contents conflict in purchase_delivery/purchase.py
Conflict: can't delete purchase_delivery/wizard because it is not empty.  Not deleting.
Conflict because purchase_delivery/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in purchase_delivery/wizard/__init__.py
Contents conflict in purchase_delivery/wizard/delivery_purchase_order.py
Conflict: can't delete purchase_discount because it is not empty.  Not deleting.
Conflict because purchase_discount is not versioned, but has versioned children.  Versioned directory.
Contents conflict in purchase_discount/__init__.py
Contents conflict in purchase_discount/__terp__.py
Contents conflict in purchase_discount/purchase_discount.py
Conflict: can't delete purchase_discount/report because it is not empty.  Not deleting.
Conflict because purchase_discount/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in purchase_discount/report/__init__.py
Contents conflict in purchase_discount/report/order.py
Conflict: can't delete purchase_journal because it is not empty.  Not deleting.
Conflict because purchase_journal is not versioned, but has versioned children.  Versioned directory.
Contents conflict in purchase_journal/__init__.py
Contents conflict in purchase_journal/__terp__.py
Contents conflict in purchase_journal/purchase_journal.py
Contents conflict in purchase_journal/purchase_journal_inherit.py
Contents conflict in purchase_journal/purchase_journal_report.py
Conflict: can't delete purchase_number because it is not empty.  Not deleting.
Conflict because purchase_number is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete purchase_tax_include because it is not empty.  Not deleting.
Conflict because purchase_tax_include is not versioned, but has versioned children.  Versioned directory.
Contents conflict in purchase_tax_include/__init__.py
Contents conflict in purchase_tax_include/purchase_tax_incl.py
Contents conflict in purchase_tax_include/purchase_tax_incl.xml
Conflict: can't delete purchase_tender because it is not empty.  Not deleting.
Conflict because purchase_tender is not versioned, but has versioned children.  Versioned directory.
Contents conflict in purchase_tender/__init__.py
Contents conflict in purchase_tender/__terp__.py
Conflict: can't delete radiotv because it is not empty.  Not deleting.
Conflict because radiotv is not versioned, but has versioned children.  Versioned directory.
Contents conflict in radiotv/__init__.py
Conflict: can't delete radiotv/i18n because it is not empty.  Not deleting.
Conflict because radiotv/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in radiotv/i18n/radiotv.pot
Contents conflict in radiotv/radiotv.py
Contents conflict in radiotv/radiotv_view.xml
Contents conflict in radiotv/radiotv_wizard.xml
Conflict: can't delete radiotv/report because it is not empty.  Not deleting.
Conflict because radiotv/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in radiotv/report/__init__.py
Contents conflict in radiotv/report/broadcast_compact_report.py
Contents conflict in radiotv/report/broadcast_compact_report.rml
Contents conflict in radiotv/report/broadcast_compact_report.sxw
Contents conflict in radiotv/report/broadcast_compact_report_v2.rml
Contents conflict in radiotv/report/broadcast_declaration_report.py
Contents conflict in radiotv/report/broadcast_declaration_report.rml
Contents conflict in radiotv/report/broadcast_declaration_report.sxw
Contents conflict in radiotv/report/broadcast_report.py
Contents conflict in radiotv/report/broadcast_report.rml
Contents conflict in radiotv/report/broadcast_report.sxw
Contents conflict in radiotv/report/common.py
Conflict: can't delete radiotv/wizard because it is not empty.  Not deleting.
Conflict because radiotv/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in radiotv/wizard/__init__.py
Contents conflict in radiotv/wizard/export_table.py
Contents conflict in radiotv/wizard/wizard_broadcast_compact_report.py
Contents conflict in radiotv/wizard/wizard_broadcast_declaration_report.py
Contents conflict in radiotv/wizard/wizard_copy_broadcasts.py
Contents conflict in radiotv/wizard/wizard_export_broadcasts.py
Contents conflict in radiotv/wizard/wizard_export_channels_programs.py
Contents conflict in radiotv/wizard/wizard_export_podcasts.py
Conflict: can't delete report_analytic2 because it is not empty.  Not deleting.
Conflict because report_analytic2 is not versioned, but has versioned children.  Versioned directory.
Contents conflict in report_analytic2/__terp__.py
Contents conflict in report_analytic2/account_analytic_analysis_view.xml
Conflict: can't delete report_analytic_planning_delegate because it is not empty.  Not deleting.
Conflict because report_analytic_planning_delegate is not versioned, but has versioned children.  Versioned directory.
Contents conflict in report_analytic_planning_delegate/__init__.py
Contents conflict in report_analytic_planning_delegate/__terp__.py
Contents conflict in report_analytic_planning_delegate/report_analytic_planning.py
Contents conflict in report_analytic_planning_delegate/report_analytic_planning_view.xml
Conflict: can't delete report_analytic_planning_long_term because it is not empty.  Not deleting.
Conflict because report_analytic_planning_long_term is not versioned, but has versioned children.  Versioned directory.
Contents conflict in report_analytic_planning_long_term/__init__.py
Contents conflict in report_analytic_planning_long_term/__terp__.py
Contents conflict in report_analytic_planning_long_term/report_analytic_planning_long_term.py
Contents conflict in report_analytic_planning_long_term/report_analytic_planning_long_term_view.xml
Conflict: can't delete report_auction because it is not empty.  Not deleting.
Conflict because report_auction is not versioned, but has versioned children.  Versioned directory.
Contents conflict in report_auction/__init__.py
Contents conflict in report_auction/__terp__.py
Contents conflict in report_auction/report_auction.py
Conflict: can't delete report_dm because it is not empty.  Not deleting.
Conflict because report_dm is not versioned, but has versioned children.  Versioned directory.
Contents conflict in report_dm/__terp__.py
Conflict: can't delete report_hotel_reservation because it is not empty.  Not deleting.
Conflict because report_hotel_reservation is not versioned, but has versioned children.  Versioned directory.
Contents conflict in report_hotel_reservation/__terp__.py
Contents conflict in report_hotel_reservation/report_hotel_reservation_view.xml
Conflict: can't delete report_hotel_restaurant because it is not empty.  Not deleting.
Conflict because report_hotel_restaurant is not versioned, but has versioned children.  Versioned directory.
Contents conflict in report_hotel_restaurant/report_hotel_restaurant_view.xml
Conflict: can't delete report_timesheet_user because it is not empty.  Not deleting.
Conflict because report_timesheet_user is not versioned, but has versioned children.  Versioned directory.
Contents conflict in report_timesheet_user/__init__.py
Contents conflict in report_timesheet_user/__terp__.py
Contents conflict in report_timesheet_user/report_timesheet_user.py
Conflict: can't delete sale_advertising because it is not empty.  Not deleting.
Conflict because sale_advertising is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_advertising/__init__.py
Contents conflict in sale_advertising/__terp__.py
Contents conflict in sale_advertising/sale_advertising.py
Contents conflict in sale_advertising/sale_advertising_demo.xml
Contents conflict in sale_advertising/sale_advertising_view.xml
Conflict: can't delete sale_advertising/security because it is not empty.  Not deleting.
Conflict because sale_advertising/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_advertising/security/ir.model.access.csv
Conflict: can't delete sale_category because it is not empty.  Not deleting.
Conflict because sale_category is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_category/__init__.py
Contents conflict in sale_category/__terp__.py
Conflict: can't delete sale_category/report because it is not empty.  Not deleting.
Conflict because sale_category/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_category/report/__init__.py
Contents conflict in sale_category/report/sale_category_report.py
Contents conflict in sale_category/sale.py
Conflict: can't delete sale_delivery because it is not empty.  Not deleting.
Conflict because sale_delivery is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_delivery/__init__.py
Contents conflict in sale_delivery/sale_delivery.py
Conflict: can't delete sale_delivery/security because it is not empty.  Not deleting.
Conflict because sale_delivery/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_delivery/security/ir.model.access.csv
Conflict: can't delete sale_expected_invoice_date because it is not empty.  Not deleting.
Conflict because sale_expected_invoice_date is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_expected_invoice_date/__init__.py
Contents conflict in sale_expected_invoice_date/__terp__.py
Contents conflict in sale_expected_invoice_date/sale_expected_invoice_date.py
Conflict: can't delete sale_forecast because it is not empty.  Not deleting.
Conflict because sale_forecast is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_forecast/__init__.py
Contents conflict in sale_forecast/__openerp__.py
Conflict: can't delete sale_forecast/report because it is not empty.  Not deleting.
Conflict because sale_forecast/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_forecast/report/__init__.py
Contents conflict in sale_forecast/report/sale_forecast_salesman.py
Contents conflict in sale_forecast/report/sale_forecasts_report.py
Contents conflict in sale_forecast/sale_forecast.py
Contents conflict in sale_forecast/sale_forecast_view.xml
Conflict: can't delete sale_forecast/security because it is not empty.  Not deleting.
Conflict because sale_forecast/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_forecast/security/ir.model.access.csv
Conflict: can't delete sale_forecast/wizard because it is not empty.  Not deleting.
Conflict because sale_forecast/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_forecast/wizard/__init__.py
Contents conflict in sale_forecast/wizard/sale_forecast_wizard.py
Conflict: can't delete sale_intercompany because it is not empty.  Not deleting.
Conflict because sale_intercompany is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete sale_intercompany/wizard because it is not empty.  Not deleting.
Conflict because sale_intercompany/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_intercompany/wizard/makesale.py
Conflict: can't delete sale_intercompany_auto because it is not empty.  Not deleting.
Conflict because sale_intercompany_auto is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_intercompany_auto/__init__.py
Contents conflict in sale_intercompany_auto/__terp__.py
Contents conflict in sale_intercompany_auto/sale_interco.py
Conflict adding file sale_layout.  Moved existing file to sale_layout.moved.
Conflict: can't delete sale_margin.moved because it is not empty.  Not deleting.
Conflict adding file sale_margin.  Moved existing file to sale_margin.moved.
Conflict because sale_margin.moved is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_margin.moved/__init__.py
Contents conflict in sale_margin.moved/__terp__.py
Contents conflict in sale_margin.moved/invoice_margin.py
Contents conflict in sale_margin.moved/report_margin.py
Contents conflict in sale_margin.moved/sale_margin.py
Conflict: can't delete sale_margin_delivery because it is not empty.  Not deleting.
Conflict because sale_margin_delivery is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_margin_delivery/__init__.py
Contents conflict in sale_margin_delivery/__terp__.py
Contents conflict in sale_margin_delivery/sale_margin_delivery.py
Conflict: can't delete sale_numbers because it is not empty.  Not deleting.
Conflict because sale_numbers is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_numbers/__init__.py
Contents conflict in sale_numbers/__terp__.py
Conflict: can't delete sale_numbers/report because it is not empty.  Not deleting.
Conflict because sale_numbers/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_numbers/report/__init__.py
Contents conflict in sale_numbers/report/sale_order.py
Contents conflict in sale_numbers/sale_order.py
Conflict: can't delete sale_payment because it is not empty.  Not deleting.
Conflict because sale_payment is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_payment/__init__.py
Conflict: can't delete sale_payment/i18n because it is not empty.  Not deleting.
Conflict because sale_payment/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_payment/sale_payment.py
Contents conflict in sale_payment/sale_payment_view.xml
Conflict: can't delete sale_product_multistep_configurator because it is not empty.  Not deleting.
Conflict because sale_product_multistep_configurator is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_product_multistep_configurator/__init__.py
Conflict: can't delete sale_product_multistep_configurator/i18n because it is not empty.  Not deleting.
Conflict because sale_product_multistep_configurator/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_product_multistep_configurator/sale_product_multistep_configurator.py
Contents conflict in sale_product_multistep_configurator/sale_product_multistep_configurator.xml
Conflict: can't delete sale_rebate because it is not empty.  Not deleting.
Conflict because sale_rebate is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_rebate/__init__.py
Contents conflict in sale_rebate/__terp__.py
Contents conflict in sale_rebate/sale.py
Conflict: can't delete sale_supplier_direct_delivery because it is not empty.  Not deleting.
Conflict because sale_supplier_direct_delivery is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_supplier_direct_delivery/__init__.py
Contents conflict in sale_supplier_direct_delivery/mrp.py
Contents conflict in sale_supplier_direct_delivery/partner.py
Contents conflict in sale_supplier_direct_delivery/product.py
Contents conflict in sale_supplier_direct_delivery/product_view.xml
Contents conflict in sale_supplier_direct_delivery/purchase.py
Conflict: can't delete sale_supplier_direct_delivery/report because it is not empty.  Not deleting.
Conflict because sale_supplier_direct_delivery/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_supplier_direct_delivery/report/__init__.py
Contents conflict in sale_supplier_direct_delivery/report/supplier_report.py
Contents conflict in sale_supplier_direct_delivery/sale.py
Contents conflict in sale_supplier_direct_delivery/stock.py
Conflict: can't delete sale_tax_include because it is not empty.  Not deleting.
Conflict because sale_tax_include is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_tax_include/__init__.py
Contents conflict in sale_tax_include/__terp__.py
Conflict: can't delete sale_tax_include/i18n because it is not empty.  Not deleting.
Conflict because sale_tax_include/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_tax_include/sale_tax_incl.py
Contents conflict in sale_tax_include/sale_tax_incl.xml
Conflict: can't delete sale_wo_prices because it is not empty.  Not deleting.
Conflict because sale_wo_prices is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete sale_wo_production because it is not empty.  Not deleting.
Conflict because sale_wo_production is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sale_wo_production/__init__.py
Contents conflict in sale_wo_production/__terp__.py
Conflict: can't delete sales_purchase_seq because it is not empty.  Not deleting.
Conflict because sales_purchase_seq is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sales_purchase_seq/__init__.py
Contents conflict in sales_purchase_seq/__terp__.py
Contents conflict in sales_purchase_seq/sales_purchase_seq.py
Conflict: can't delete sales_server_action because it is not empty.  Not deleting.
Conflict because sales_server_action is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sales_server_action/__init__.py
Contents conflict in sales_server_action/__terp__.py
Conflict: can't delete sandwich because it is not empty.  Not deleting.
Conflict because sandwich is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sandwich/__init__.py
Contents conflict in sandwich/__terp__.py
Conflict: can't delete sandwich/report because it is not empty.  Not deleting.
Conflict because sandwich/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sandwich/report/__init__.py
Contents conflict in sandwich/report/sandwich_report.py
Contents conflict in sandwich/sandwich.py
Conflict: can't delete sandwich/wizard because it is not empty.  Not deleting.
Conflict because sandwich/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in sandwich/wizard/__init__.py
Contents conflict in sandwich/wizard/order_create.py
Contents conflict in sandwich/wizard/sandwich_wizard.py
Conflict: can't delete scripts because it is not empty.  Not deleting.
Conflict because scripts is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete scripts/tinyerp_demo because it is not empty.  Not deleting.
Conflict because scripts/tinyerp_demo is not versioned, but has versioned children.  Versioned directory.
Contents conflict in scripts/tinyerp_demo/create_demo_db.py
Conflict: can't delete segmentation because it is not empty.  Not deleting.
Conflict because segmentation is not versioned, but has versioned children.  Versioned directory.
Contents conflict in segmentation/__init__.py
Contents conflict in segmentation/__terp__.py
Contents conflict in segmentation/segmentation.py
Conflict: can't delete segmentation/wizard because it is not empty.  Not deleting.
Conflict because segmentation/wizard is not versioned, but has versioned children.  Versioned directory.
Contents conflict in segmentation/wizard/__init__.py
Contents conflict in segmentation/wizard/open_partner.py
Conflict: can't delete stock_location_pull because it is not empty.  Not deleting.
Conflict because stock_location_pull is not versioned, but has versioned children.  Versioned directory.
Contents conflict in stock_location_pull/__init__.py
Contents conflict in stock_location_pull/__terp__.py
Conflict: can't delete stock_location_pull/i18n because it is not empty.  Not deleting.
Conflict because stock_location_pull/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in stock_location_pull/i18n/es_AR.po
Contents conflict in stock_location_pull/i18n/nl_BE.po
Contents conflict in stock_location_pull/i18n/pt_BR.po
Contents conflict in stock_location_pull/i18n/zh_CN.po
Contents conflict in stock_location_pull/i18n/zh_TW.po
Contents conflict in stock_location_pull/mrp_pull.py
Contents conflict in stock_location_pull/mrp_pull_workflow.xml
Conflict: can't delete stock_location_pull/security because it is not empty.  Not deleting.
Conflict because stock_location_pull/security is not versioned, but has versioned children.  Versioned directory.
Contents conflict in stock_location_pull/security/ir.model.access.csv
Contents conflict in stock_location_pull/stock.py
Contents conflict in stock_location_pull/stock_view.xml
Conflict: can't delete stock_planning.moved because it is not empty.  Not deleting.
Conflict adding file stock_planning.  Moved existing file to stock_planning.moved.
Conflict because stock_planning.moved is not versioned, but has versioned children.  Versioned directory.
Contents conflict in stock_planning.moved/__init__.py
Contents conflict in stock_planning.moved/__terp__.py
Contents conflict in stock_planning.moved/stock_planning.py
Contents conflict in stock_planning.moved/stock_planning_view.xml
Conflict adding file survey.  Moved existing file to survey.moved.
Conflict: can't delete test_44 because it is not empty.  Not deleting.
Conflict because test_44 is not versioned, but has versioned children.  Versioned directory.
Contents conflict in test_44/__init__.py
Contents conflict in test_44/__terp__.py
Contents conflict in test_44/test.py
Conflict: can't delete test_server because it is not empty.  Not deleting.
Conflict because test_server is not versioned, but has versioned children.  Versioned directory.
Contents conflict in test_server/__terp__.py
Conflict: can't delete tiny_purchase because it is not empty.  Not deleting.
Conflict because tiny_purchase is not versioned, but has versioned children.  Versioned directory.
Contents conflict in tiny_purchase/__init__.py
Contents conflict in tiny_purchase/__terp__.py
Conflict: can't delete tiny_purchase/report because it is not empty.  Not deleting.
Conflict because tiny_purchase/report is not versioned, but has versioned children.  Versioned directory.
Contents conflict in tiny_purchase/report/__init__.py
Contents conflict in tiny_purchase/report/tiny_purchase_order_report.py
Contents conflict in tiny_purchase/tiny_purchase.py
Conflict: can't delete travel because it is not empty.  Not deleting.
Conflict because travel is not versioned, but has versioned children.  Versioned directory.
Contents conflict in travel/__init__.py
Contents conflict in travel/__terp__.py
Contents conflict in travel/custom.py
Conflict: can't delete user_ctg because it is not empty.  Not deleting.
Conflict because user_ctg is not versioned, but has versioned children.  Versioned directory.
Contents conflict in user_ctg/__init__.py
Contents conflict in user_ctg/__terp__.py
Contents conflict in user_ctg/lp_server.py
Contents conflict in user_ctg/user_ctg.py
Contents conflict in user_ctg/user_ctg_data.xml
Contents conflict in user_ctg/user_ctg_view.xml
Conflict: can't delete users_ldap.moved because it is not empty.  Not deleting.
Conflict adding file users_ldap.  Moved existing file to users_ldap.moved.
Conflict because users_ldap.moved is not versioned, but has versioned children.  Versioned directory.
Contents conflict in users_ldap.moved/__init__.py
Contents conflict in users_ldap.moved/__terp__.py
Contents conflict in users_ldap.moved/users_ldap.py
Conflict: can't delete virustotal because it is not empty.  Not deleting.
Conflict because virustotal is not versioned, but has versioned children.  Versioned directory.
Contents conflict in virustotal/__init__.py
Contents conflict in virustotal/__terp__.py
Contents conflict in virustotal/attachment.py
Conflict: can't delete webmail because it is not empty.  Not deleting.
Conflict because webmail is not versioned, but has versioned children.  Versioned directory.
Contents conflict in webmail/webmail.py
Conflict: can't delete wizard_access_rules because it is not empty.  Not deleting.
Conflict because wizard_access_rules is not versioned, but has versioned children.  Versioned directory.
Contents conflict in wizard_access_rules/__init__.py
Contents conflict in wizard_access_rules/__terp__.py
Contents conflict in wizard_access_rules/wizard_acl.py
Contents conflict in wizard_access_rules/wizard_acl_view.xml
Conflict: can't delete zarafa because it is not empty.  Not deleting.
Conflict because zarafa is not versioned, but has versioned children.  Versioned directory.