Commit 8587b684 authored by Bryce Johnson's avatar Bryce Johnson

Remove conflict causing newlines.

parent f125b097
...@@ -8,15 +8,18 @@ export default { ...@@ -8,15 +8,18 @@ export default {
type: String, type: String,
required: true, required: true,
}, },
jobs: { jobs: {
type: Array, type: Array,
required: true, required: true,
}, },
isFirstColumn: { isFirstColumn: {
type: Boolean, type: Boolean,
required: false, required: false,
default: false, default: false,
}, },
stageConnectorClass: { stageConnectorClass: {
type: String, type: String,
required: false, required: false,
...@@ -27,14 +30,17 @@ export default { ...@@ -27,14 +30,17 @@ export default {
required: true, required: true,
}, },
}, },
components: { components: {
jobComponent, jobComponent,
dropdownJobComponent, dropdownJobComponent,
}, },
methods: { methods: {
firstJob(list) { firstJob(list) {
return list[0]; return list[0];
}, },
jobId(job) { jobId(job) {
return `ci-badge-${job.name}`; return `ci-badge-${job.name}`;
}, },
......
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