Merge branch 'thierry' of ssh://git.marbelium.com:10023/Viiciouss/Sup_File into anis

6 years ago · d06f323c9e
parent cb0543d590 5d1960cd6e
commit d06f323c9e
1 changed files with 0 additions and 4 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -14797,11 +14797,7 @@
      "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz",
      "integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==",
      "requires": {
-<<<<<<< HEAD
        "random-bytes": "1.0.0"
-=======
-        "random-bytes": "~1.0.0"
->>>>>>> 98b837065bd51764d8da85c7972979c9fcf214dc
      }
    },
    "uid2": {