fix merge conflicts

2016-01-02 18:42:39 -05:00
parent 4e979c8a0f
commit f9d4af0ef6
2 changed files with 8 additions and 8 deletions
@@ -15,12 +15,12 @@
  },
  "devDependencies": {},
  "ignore": [],
-  "version": "1.0.11",
-  "_release": "1.0.11",
+  "version": "1.0.6",
+  "_release": "1.0.6",
  "_resolution": {
    "type": "version",
-    "tag": "1.0.11",
-    "commit": "8838a06a04887893b4a0e165764067409f4f3518"
+    "tag": "1.0.6",
+    "commit": "4d04f0ed205e94c00160c48dc131b9d8dbed995f"
  },
  "_source": "git://github.com/MediaBrowser/emby-webcomponents.git",
  "_target": "~1.0.0",