Commit 42d5da67 authored by Filipa Lacerda's avatar Filipa Lacerda

Resolve conflicts for spec/javascripts/vue_shared/components/reports/report_section_spec.js

parent 29ba320a
......@@ -86,10 +86,6 @@ describe('Report section', () => {
});
});
});
<<<<<<< HEAD
=======
>>>>>>> upstream/master
describe('when it is loading', () => {
it('should render loading indicator', () => {
vm = mountComponent(ReportSection, {
......@@ -175,7 +171,6 @@ describe('Report section', () => {
expect(vm.$el.textContent.trim()).toEqual('Failed to load codeclimate report');
});
});
<<<<<<< HEAD
describe('With full report', () => {
beforeEach(() => {
......@@ -259,6 +254,4 @@ describe('Report section', () => {
});
});
});
=======
>>>>>>> upstream/master
});
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