fix；处理冲突

2021-10-14 14:54:00 +08:00
parent 0558619ad6
commit aaae74c01a
1 changed files with 0 additions and 3 deletions
--- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
+++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
@@ -1779,12 +1779,9 @@ export default {
      const delObj = this.selection.pen ? this.selection.pen.id : this.selection.pens
      this.$emit('del', delObj)
    },
-<<<<<<< HEAD
-=======
    getMetricOptions () {
      return this.metricOptions
    },
->>>>>>> 4b4994f59cfffd4aad8579464b56be2c5e523769
    addExpression () {
      this.selection.pen.data.expressAllArr.push('')
      this.selection.pen.data.legendsAll.push('')