danielGe/TiendaFront
2
0
Fork 0
Code Issues Pull Requests 3 Releases Wiki Activity

mostrando en Home

Browse Source
This commit is contained in:
Enrique Maya García
2020-10-27 18:04:38 -06:00
parent 5ac7f52101 6c21a132f7
commit b18c5eb606
8 changed files with 500 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+18
View File
@@ -10969,6 +10969,7 @@
},
"vue-loader-v16": {
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
"version": "npm:vue-loader@16.0.0-beta.7",
@@ -10994,6 +10995,8 @@
"requires": {
"@types/color-name": "^1.1.1",
=======
>>>>>>> origin
=======
>>>>>>> origin
"version": "npm:vue-loader@16.0.0-beta.8",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.8.tgz",
@@ -11014,13 +11017,17 @@
"optional": true,
"requires": {
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> origin
>>>>>>> origin
=======
>>>>>>> origin
"color-convert": "^2.0.1"
}
},
"chalk": {
<<<<<<< HEAD
<<<<<<< HEAD
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
@@ -11035,6 +11042,11 @@
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
>>>>>>> origin
>>>>>>> origin
=======
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
>>>>>>> origin
"dev": true,
"optional": true,
@@ -11068,6 +11080,7 @@
"optional": true
},
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
"source-map": {
@@ -11077,6 +11090,8 @@
"dev": true,
"optional": true
=======
>>>>>>> origin
=======
>>>>>>> origin
"loader-utils": {
"version": "2.0.0",
@@ -11090,8 +11105,11 @@
"json5": "^2.1.2"
}
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> origin
>>>>>>> origin
=======
>>>>>>> origin
},
"supports-color": {