Skip to content

A free open source IT asset/license management system

Moved password visibility toggle to snipeit.js

snipe320654917069
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 2434d185c8..ace5a387de 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,5 +1,9 @@
{
+<<<<<<< HEAD
"/js/dist/all.js": "/js/dist/all.js?id=4619b48bfce17ad41fc5a2e9ee578988",
+=======
+ "/js/dist/all.js": "/js/dist/all.js?id=9e8d236a555ae26809ad859e5a2bff9d",
+>>>>>>> b37adb8c49 (Moved password visibility toggle to snipeit.js)
"/css/build/overrides.css": "/css/build/overrides.css?id=c173dd71d56c1089bf560a849586d93e",
"/css/build/app.css": "/css/build/app.css?id=63ef76491d01db361ad53cf1c8c7114f",
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=ee0ed88465dd878588ed044eefb67723",