Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
3cfe6bf6 1 parent 41a29df6

modify

Inline Side-by-side
Showing 1 changed file with 0 additions and 4 deletions
...@@ -244,8 +244,4 @@ export default { ...@@ -244,8 +244,4 @@ export default {
244 244
245 <style lang="scss" scoped> 245 <style lang="scss" scoped>
246 246
247 -<<<<<<< HEAD
248 </style> 247 </style>
249 -=======
250 -</style>
251 ->>>>>>> test
......