Skip to content

Commit

Permalink
Merge branch 'dev' into renovate/eslint-6.x
Browse files Browse the repository at this point in the history
  • Loading branch information
clarkdo committed Jun 25, 2019
2 parents cf48e14 + 445584f commit f8124b5
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion examples/storybook/stories/MyButton.story.js
@@ -1,7 +1,7 @@

import { storiesOf } from '@storybook/vue'
import MyButton from '~/components/Button.vue'
import Centered from '@storybook/addon-centered'
import MyButton from '~/components/Button.vue'

storiesOf('Button', module)
.addDecorator(Centered)
Expand Down
3 changes: 1 addition & 2 deletions examples/storybook/stories/vuetify.story.js
@@ -1,8 +1,7 @@
import { storiesOf } from '@storybook/vue'

import VuetifyLogo from '~/components/VuetifyLogo.vue'

import Centered from '@storybook/addon-centered'
import VuetifyLogo from '~/components/VuetifyLogo.vue'

storiesOf('Vuetify/Logo', module)
.addDecorator(Centered)
Expand Down
2 changes: 1 addition & 1 deletion examples/typescript-vuex/pages/index.vue
Expand Up @@ -19,8 +19,8 @@

<script lang="ts">
import { Component, Vue } from 'vue-property-decorator'
import Card from '~/components/Card.vue'
import { namespace } from 'vuex-class'
import Card from '~/components/Card.vue'
import * as people from '~/store/modules/people'
Expand Down
2 changes: 1 addition & 1 deletion examples/vue-chartjs/pages/contributors.vue
Expand Up @@ -5,8 +5,8 @@
</template>

<script>
import DoughnutChart from '~/components/doughnut-chart'
import axios from 'axios'
import DoughnutChart from '~/components/doughnut-chart'
function getRandomColor() {
const letters = '0123456789ABCDEF'
Expand Down
2 changes: 1 addition & 1 deletion examples/vue-chartjs/pages/index.vue
Expand Up @@ -5,9 +5,9 @@
</template>

<script>
import BarChart from '~/components/bar-chart'
import axios from 'axios'
import moment from 'moment'
import BarChart from '~/components/bar-chart'
export default {
components: {
Expand Down

0 comments on commit f8124b5

Please sign in to comment.