resovle merge conflicts

electrode-io · Nov 23, 2016 · a776546 · a776546
2 parents a4ee410 + 6aada53
commit a776546
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/packages/electrode-webpack-reporter/lib/module-processor.js b/packages/electrode-webpack-reporter/lib/module-processor.js
@@ -49,6 +49,7 @@ class ModuleProcessor {
       [name] : name.split(tildaSep).splice(1);
     const n = pkgs.pop();
     const match = n.match(n.startsWith("@") ? atModRegex : modRegex);
+
     if (match) {
       return {
         name: match[1],

diff --git a/packages/electrode-webpack-reporter/package.json b/packages/electrode-webpack-reporter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electrode-webpack-reporter",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "A HTML based reporter for webpack dev server",
   "main": "lib/webpack-reporter.js",
   "scripts": {