Commit 2f462ba5 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Fix conflicts

parent 5f33661c
......@@ -6,14 +6,9 @@
= sprite_icon('fork', size: 12)
= ref
- if current_action?(:edit) || current_action?(:update)
<<<<<<< HEAD
= text_field_tag 'file_path', (params[:file_path] || @path),
class: 'form-control new-file-path js-file-path-name-input'
=======
%span.editor-file-name
= text_field_tag 'file_path', (params[:file_path] || @path),
class: 'form-control new-file-path js-file-path-name-input'
>>>>>>> upstream/master
- if current_action?(:new) || current_action?(:create)
%span.editor-file-name
......
---
title: Fix blocked user card style
<<<<<<< HEAD
merge_request: 6849
=======
merge_request: 21095
>>>>>>> upstream/master
author:
type: fixed
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