Fix erreur de rebase

preferences/forms.py

@@ -51,7 +51,6 @@ class EditOptionalUserForm(ModelForm):
         self.fields['max_solde'].label = 'Solde maximum'
         self.fields['min_online_payment'].label = 'Montant de rechargement minimum en ligne'
         self.fields['self_adhesion'].label = 'Auto inscription'
-        self.fields['max_recharge'].label = 'Rechargement max'
 
 
 class EditOptionalMachineForm(ModelForm):

preferences/models.py

@@ -52,10 +52,6 @@ class OptionalUser(models.Model):
         max_digits=5,
         decimal_places=2,
         default=10
-    max_recharge = models.DecimalField(
-        max_digits=5,
-        decimal_places=2,
-        default=50
     )
     gpg_fingerprint = models.BooleanField(default=True)
     all_can_create = models.BooleanField(