Skip to content

Commit

Permalink
Merge branch 'master' into bulma
Browse files Browse the repository at this point in the history
# Conflicts:
#	package-lock.json
#	package.json
  • Loading branch information
helmuthdu committed Mar 3, 2019
2 parents affaaa4 + 3b90180 commit 0ee1c69
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 2 deletions.
@@ -1,5 +1,5 @@
import { shallowMount } from '@vue/test-utils';
import HelloWorld from '../hello-world.vue';
import HelloWorld from '../hello-world.component.vue';

describe('HelloWorld component', () => {
it('renders props.msg when passed', () => {
Expand Down
Expand Up @@ -51,7 +51,7 @@
import { Component, Prop, Vue } from 'vue-property-decorator';
@Component
export default class extends Vue {
export default class HelloWorld extends Vue {
@Prop()
public msg: string;
}
Expand Down
1 change: 1 addition & 0 deletions src/decorators/index.ts
@@ -0,0 +1 @@
export * from './http.decorator';
2 changes: 2 additions & 0 deletions src/helpers/index.ts
@@ -0,0 +1,2 @@
export * from './search.helper';
export * from './webworker.helper';

0 comments on commit 0ee1c69

Please sign in to comment.