Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Maintenance: Fixed rebase issue leftover causing syntax error.

Browse source
This commit is contained in:
Thorsten Eckel 2020-11-16 10:40:08 +01:00
parent 498e5ba487
commit eda100425b
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
spec/system/ticket/zoom_spec.rb
View file

@ -1094,7 +1094,6 @@ RSpec.describe 'Ticket zoom', type: :system do
end end
end end
<<<<<<< HEAD
# https://github.com/zammad/zammad/issues/3260 # https://github.com/zammad/zammad/issues/3260
describe 'next in overview macro changes URL', authenticated_as: :authenticate do describe 'next in overview macro changes URL', authenticated_as: :authenticate do
let(:ticket_a) { create(:ticket, title: 'ticket a', group: Group.first) } let(:ticket_a) { create(:ticket, title: 'ticket a', group: Group.first) }