Fix merge conflicts

2018-07-31 01:17:55 -07:00 · 2018-07-31 01:17:55 -07:00 · 6dfd74b048
--- a/dist/powerbi.min.js
+++ b/dist/powerbi.min.js
--- a/package.json
+++ b/package.json
@ -75,11 +75,7 @@
  },
  "dependencies": {
    "http-post-message": "^0.2",
-<<<<<<< HEAD
-    "powerbi-models": "^1.0",
-=======
    "powerbi-models": "^1.0.8",
->>>>>>> powerbi/master
    "powerbi-router": "^0.1",
    "window-post-message-proxy": "^0.2"
  },