From 7f7e829814ffa9ade00c8f189ffeaff035c84202 Mon Sep 17 00:00:00 2001
From: "Alexandre Fayolle @ camptocamp" <alexandre.fayolle@camptocamp.com>
Date: Wed, 7 Nov 2012 11:44:25 +0100
Subject: [PATCH] fix bad merge (bis) (lp:c2c-addons/6.1  rev 89.1.53)

---
 account_credit_control/data.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/account_credit_control/data.xml b/account_credit_control/data.xml
index 22274e561..590f19b10 100644
--- a/account_credit_control/data.xml
+++ b/account_credit_control/data.xml
@@ -95,7 +95,7 @@
       <field name="delay_days" eval="10"/>
       <field name="mail_template_id" ref="email_template_credit_control_base"/>
       <field name="policy_id" ref="credit_control_3_time"/>
-      <field name="canal">mail</field>
+      <field name="channel">mail</field>
       <field name="custom_text">Dear Sir or Madam,
 
 Our records indicate that we have not received the payment of the
@@ -117,7 +117,7 @@ Best regards,
       <field name="delay_days" eval="30"/>
       <field name="mail_template_id" ref="email_template_credit_control_base"/>
       <field name="policy_id" ref="credit_control_3_time"/>
-      <field name="canal">mail</field>
+      <field name="channel">mail</field>
       <field name="custom_text">Dear Sir or Madam,
 
 Our records indicate that we have not yet received the payment of the
@@ -139,7 +139,7 @@ Best regards,
       <field name="delay_days" eval="10"/>
       <field name="mail_template_id" ref="email_template_credit_control_base"/>
       <field name="policy_id" ref="credit_control_3_time"/>
-      <field name="canal">letter</field>
+      <field name="channel">letter</field>
       <field name="custom_text">Dear Sir or Madam,
 
 Our records indicate that we still have not received the payment of
@@ -172,7 +172,7 @@ Best regards,
       <field name="delay_days" eval="30"/>
       <field name="mail_template_id" ref="email_template_credit_control_base"/>
       <field name="policy_id" ref="credit_control_2_time"/>
-      <field name="canal">mail</field>
+      <field name="channel">mail</field>
       <field name="custom_text">Dear Sir or Madam,
 
 Our records indicate that we have not received the payment of the
@@ -194,7 +194,7 @@ Best regards,
       <field name="delay_days" eval="60"/>
       <field name="mail_template_id" ref="email_template_credit_control_base"/>
       <field name="policy_id" ref="credit_control_2_time"/>
-      <field name="canal">letter</field>
+      <field name="channel">letter</field>
       <field name="custom_text">Dear Sir or Madam,
 
 Our records indicate that we still have not received the payment of