Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

package-lock.json

@@ -4731,8 +4731,13 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
+<<<<<<< .mine
 <<<<<<< HEAD
           "bundled": true,
+=======
+          "resolved": false,
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+>>>>>>> .theirs
           "dev": true,
           "optional": true
 =======
@@ -4761,8 +4766,13 @@
         },
         "balanced-match": {
           "version": "1.0.0",
+<<<<<<< .mine
 <<<<<<< HEAD
           "bundled": true,
+=======
+          "resolved": false,
+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+>>>>>>> .theirs
           "dev": true,
           "optional": true
 =======
@@ -4791,20 +4801,27 @@
         },
         "code-point-at": {
           "version": "1.1.0",
+<<<<<<< .mine
 <<<<<<< HEAD
           "bundled": true,
+=======
+          "resolved": false,
+          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+>>>>>>> .theirs
           "dev": true,
           "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
           "dev": true,
           "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
           "dev": true,
           "optional": true
 =======
@@ -4952,8 +4969,13 @@
         },
         "inherits": {
           "version": "2.0.3",
+<<<<<<< .mine
 <<<<<<< HEAD
           "bundled": true,
+=======
+          "resolved": false,
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+>>>>>>> .theirs
           "dev": true,
           "optional": true
 =======
@@ -4998,8 +5020,13 @@
         },
         "minimist": {
           "version": "0.0.8",
+<<<<<<< .mine
 <<<<<<< HEAD
           "bundled": true,
+=======
+          "resolved": false,
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+>>>>>>> .theirs
           "dev": true,
           "optional": true
 =======
@@ -5121,8 +5148,13 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
+<<<<<<< .mine
 <<<<<<< HEAD
           "bundled": true,
+=======
+          "resolved": false,
+          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+>>>>>>> .theirs
           "dev": true,
           "optional": true
 =======
@@ -5237,8 +5269,13 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
+<<<<<<< .mine
 <<<<<<< HEAD
           "bundled": true,
+=======
+          "resolved": false,
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+>>>>>>> .theirs
           "dev": true,
           "optional": true
 =======
@@ -5356,14 +5393,20 @@
         },
         "wrappy": {
           "version": "1.0.2",
+<<<<<<< .mine
 <<<<<<< HEAD
           "bundled": true,
+=======
+          "resolved": false,
+          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+>>>>>>> .theirs
           "dev": true,
           "optional": true
         },
         "yallist": {
           "version": "3.0.3",
-          "bundled": true,
+          "resolved": false,
+          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
           "dev": true,
           "optional": true
 =======