Skip to content

G
gitlab-ce
Commit 6880e7c8 authored by Lukas Eipert's avatar Lukas Eipert
Browse files
Options

Resolve conflict in spec/javascripts/jobs/components/job_app_spec.js

parent a8c13759
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
spec/javascripts/jobs/components/job_app_spec.js
View file @ 6880e7c8
...@@ -184,7 +184,6 @@ describe('Job App ', () => { ...@@ -184,7 +184,6 @@ describe('Job App ', () => {
}); });
}); });
<<<<<<< HEAD
// ee-only start // ee-only start
describe('runners limit - ee', () => { describe('runners limit - ee', () => {
describe('with used quota', () => { describe('with used quota', () => {
...@@ -218,8 +217,6 @@ describe('Job App ', () => { ...@@ -218,8 +217,6 @@ describe('Job App ', () => {
// ee-only end // ee-only end
=======
>>>>>>> upstream/master
describe('environments block', () => { describe('environments block', () => {
it('renders environment block when job has environment', () => { it('renders environment block when job has environment', () => {
store.dispatch( store.dispatch(
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7