diff --git a/hotel/views/hotel_checkin_partner_views.xml b/hotel/views/hotel_checkin_partner_views.xml index 41f199389..57e227f6e 100644 --- a/hotel/views/hotel_checkin_partner_views.xml +++ b/hotel/views/hotel_checkin_partner_views.xml @@ -40,7 +40,7 @@ hotel.checkin.partner 20 - @@ -80,6 +80,10 @@ +<<<<<<< HEAD +======= + +>>>>>>> e450035e0b84d7d76516b09459a3c5507a7b79f9