merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conflicts resolved

This commit is contained in:
Pranshu Tomar 2020-03-24 16:25:10 +05:30
parent b1049ac3ea
commit 50decb81cb
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Webkul/Velocity/publishable/assets/mix-manifest.json
View File

@ -1,9 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=d3f7d56e990550452f19",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7",
<<<<<<< HEAD
"/css/velocity.css": "/css/velocity.css?id=d047a8c4cfcb4ce793e3"
=======
"/css/velocity.css": "/css/velocity.css?id=52109e4f344a8b0bce61"
>>>>>>> e6e84dfdf9e8125b3ebf5afdd139a420ad256f35
}