Anglo-Dutch consumer goods giant Unilever has resolved its pricing row with a European hypermarket group.