summaryrefslogtreecommitdiff
path: root/spec/features/projects/blobs/edit_spec.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-06-21 18:45:52 -0500
committerRobert Speicher <rspeicher@gmail.com>2017-06-29 12:18:23 -0400
commit7b674d5d55ac07d3261f9788bc2d2c17ec8b7513 (patch)
tree6fc58fdf6b6684730a4961e07f22ea8e614b81a0 /spec/features/projects/blobs/edit_spec.rb
parente939bf7be10b6ec516ffbe75ad4b4dc1151670a7 (diff)
downloadgitlab-ce-7b674d5d55ac07d3261f9788bc2d2c17ec8b7513.tar.gz
Remove a duplicated test block from the result of a conflict resolution
This was mistakenly added in 17196a2ff31 and is identical to the group above it.
Diffstat (limited to 'spec/features/projects/blobs/edit_spec.rb')
0 files changed, 0 insertions, 0 deletions