Fix Partner test assertions

tests/resources/test_partner.py

@@ -33,12 +33,11 @@ class PartnerTests(unittest.TestCase):
         ref = "1234"
         partner = Partner.get(ref)
 
-<<<<<<< HEAD
         assert partner.ref == "1234"
         assert partner.vat == "ES55642302N"
         assert partner.name == "Felip Dara"
         assert partner.member
-        assert partner.addresses[0].street == "MyStreet"
+        assert partner.addresses[0].street == "Carrer del Penal, 2"
 
     @pytest.mark.vcr()
     def test_check_sponsor_ok(self):