Commit 310b2e7f authored by Mario de la Ossa's avatar Mario de la Ossa

resolve conflicts on app/views/layouts/nav/sidebar/_profile.html.haml

parent 0d8a1472
......@@ -28,7 +28,6 @@
= link_to profile_account_path do
%strong.fly-out-top-item-name
#{ _('Account') }
<<<<<<< HEAD
- if Gitlab::CurrentSettings.should_check_namespace_plan?
= nav_link(controller: :billings) do
= link_to profile_billings_path do
......@@ -41,8 +40,6 @@
= link_to profile_billings_path do
%strong.fly-out-top-item-name
#{ _('Billing') }
=======
>>>>>>> upstream/master
- if Gitlab::CurrentSettings.user_oauth_applications?
= nav_link(controller: 'oauth/applications') do
= link_to applications_profile_path do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment