Commit a4f2150c authored by  JosephK's avatar JosephK

Fix merge

parent ba292edf
Pipeline #147483 passed with stage
in 1 minute and 45 seconds
......@@ -243,7 +243,7 @@
</h5>
<ul>
<li
v-for="n in 4"
v-for="n in 4" :key="n"
v-html="$t(`home.steps.${file}.ul[${n-1}]`)"
></li>
</ul>
......@@ -378,15 +378,6 @@ export default {
}
}
}
<<<<<<< HEAD
=======
for (let i = this.steps.length + 1; i > 0; i -= 1) {
if (this.progress.total > this.steps[i - 1]) {
this.activeStep = i;
}
}
>>>>>>> 8c969c599b6bdd6b38bc9aac43fb01587c00b752
},
},
}
......
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