Commit pour merge

openfisca · Dec 1, 2020 · 677d2d1 · 677d2d1
2 parents e126381 + d18ebea
commit 677d2d1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,4 @@ build
 *.pyc
 
 # Développement sur PyCharm IDEA
-.idea
+.idea
diff --git a/openfisca_france_local/departements/eure_et_loir/aide-menagere.py b/openfisca_france_local/departements/eure_et_loir/aide-menagere.py
@@ -1,5 +1,9 @@
 # -*- coding: utf-8 -*-
+<<<<<<< HEAD
 from openfisca_france.model.base import Variable, Individu, MONTH, not_, DIVIDE
+=======
+from openfisca_france.model.base import Variable, Individu, MONTH
+>>>>>>> d18ebea22618f63ba45cf08b6c6077fc0b4f6d1d
 from openfisca_france.model.prestations.autonomie import TypesGir
 
 
@@ -85,4 +89,8 @@ def formula_2020_01(individu, period, parameters):
         condition_ressources = individu_resources < parameters(
             period).departements.eure_et_loir.aide_menagere.montant_aspa
 
+<<<<<<< HEAD
         return condition_residence * condition_taux_incapacite * condition_age * condition_nationalite * condition_ressources
+=======
+        return condition_taux_incapacite * condition_age * condition_nationalite * condition_ressources
+>>>>>>> d18ebea22618f63ba45cf08b6c6077fc0b4f6d1d