Remove modifications in README.md

README.md

@@ -24,7 +24,6 @@ addon | version | summary
 [partner_contact_in_several_companies](partner_contact_in_several_companies/) | 9.0.1.0.0 | Allow to have one contact in several partners
 [partner_contact_nationality](partner_contact_nationality/) | 9.0.1.0.0 | Add nationality field to contacts
 [partner_contact_personal_information_page](partner_contact_personal_information_page/) | 9.0.1.0.0 | Add a page to contacts form to put personal information
-[partner_external_maps](partner_external_maps/) | 9.0.0.1.0 | Add Map and Map Routing buttons on partner form to open GMaps, OSM, Bing and others
 
 Unported addons
 ---------------
@@ -42,11 +41,7 @@ addon | version | summary
 [partner_auto_salesman](partner_auto_salesman/) | 8.0.1.0.0 (unported) | Partner auto salesman
 [partner_contact_address_detailed](partner_contact_address_detailed/) | 8.0.1.0.0 (unported) | All address data in summarized contact form
 [partner_contact_birthdate](partner_contact_birthdate/) | 8.0.1.0.0 (unported) | Contact's birthdate
-<<<<<<< 3398e80890c1e14aa3131baad1a5bf6f9ed6a96b
 [partner_external_maps](partner_external_maps/) | 8.0.0.1.0 (unported) | Add Map and Map Routing buttons on partner form to open GMaps, OSM, Bing and others
-=======
-[partner_contact_personal_information_page](partner_contact_personal_information_page/) | 8.0.1.0.0 (unported) | Add a page to contacts form to put personal information
->>>>>>> Port partner_external_maps to v9, contributed by Wim Audenaert
 [partner_firstname](partner_firstname/) | 8.0.2.0.0 (unported) | Split first name and last name for non company partners
 [partner_helper](partner_helper/) | 8.0.0.1.0 (unported) | Partner Helper
 [partner_relations](partner_relations/) | 8.0.1.1.0 (unported) | Partner relations