Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
greper committed Sep 1, 2020
2 parents 02d6db3 + 0accc40 commit 4e2c5e4
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions src/components/d2-container/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@ export default {
type: Boolean,
required: false,
default: false
},
betterScrollOptions: {
type: Object,
required: false,
default: () => ({})
}
},
computed: {
Expand All @@ -47,7 +42,6 @@ export default {
class="container-component">
<this.component
ref="component"
betterScrollOptions={this.betterScrollOptions}
{ ...{ attrs: this.$attrs } }
onScroll={ e => this.$emit('scroll', e) }>
{ slots }
Expand Down

0 comments on commit 4e2c5e4

Please sign in to comment.