fix merge error.
This commit is contained in:
		@@ -52,7 +52,7 @@ class TestBilling(TestCase):
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        reconciliation_jar.add_payments(jar_summary.payments)
 | 
					        reconciliation_jar.add_payments(jar_summary.payments)
 | 
				
			||||||
        with self.assertRaises(ValidationError):
 | 
					        with self.assertRaises(ValidationError):
 | 
				
			||||||
            reconciliation_jar.manual_clean()
 | 
					            reconciliation_jar.clean()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def test_validate_reconciliation_jar_with_cash_float(self):
 | 
					    def test_validate_reconciliation_jar_with_cash_float(self):
 | 
				
			||||||
        cash_payment1, cash_payment2 = self._create_two_cash_payments()
 | 
					        cash_payment1, cash_payment2 = self._create_two_cash_payments()
 | 
				
			||||||
@@ -69,7 +69,6 @@ class TestBilling(TestCase):
 | 
				
			|||||||
        reconciliation_jar.add_payments(jar_summary.payments)
 | 
					        reconciliation_jar.add_payments(jar_summary.payments)
 | 
				
			||||||
        reconciliation_jar.clean()
 | 
					        reconciliation_jar.clean()
 | 
				
			||||||
        reconciliation_jar.save()
 | 
					        reconciliation_jar.save()
 | 
				
			||||||
        reconciliation_jar.manual_clean()
 | 
					 | 
				
			||||||
        self.assertTrue(reconciliation_jar.is_valid)
 | 
					        self.assertTrue(reconciliation_jar.is_valid)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _create_two_cash_payments(self):
 | 
					    def _create_two_cash_payments(self):
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user