Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/davismj/templating into d…
Browse files Browse the repository at this point in the history
…avismj-master
  • Loading branch information
EisenbergEffect committed Aug 13, 2015
2 parents 94d6bc0 + 29e4a62 commit d077359
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/bindable-property.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import core from 'core-js';
import * as core from 'core-js';
import {hyphenate} from './util';
import {bindingMode} from 'aurelia-binding';

Expand Down
2 changes: 1 addition & 1 deletion src/content-selector.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import core from 'core-js';
import * as core from 'core-js';

if (Element && !Element.prototype.matches) {
var proto = Element.prototype;
Expand Down
2 changes: 1 addition & 1 deletion src/decorators.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import core from 'core-js';
import * as core from 'core-js';
import {Metadata, Decorators} from 'aurelia-metadata';
import {BindableProperty} from './bindable-property';
import {ChildObserver} from './children';
Expand Down
2 changes: 1 addition & 1 deletion src/view-engine.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import core from 'core-js';
import * as core from 'core-js';
import * as LogManager from 'aurelia-logging';
import {Origin} from 'aurelia-metadata';
import {Loader,TemplateRegistryEntry} from 'aurelia-loader';
Expand Down

0 comments on commit d077359

Please sign in to comment.