solve conflict file

2024-10-25 14:58:42 +08:00
parent 5cdb82297a
commit 3649afe328
1533 changed files with 77808 additions and 0 deletions
--- a/build/usr/local/omc/htdocs/front/js/generate-utils.BWefdR0C.js
+++ b/build/usr/local/omc/htdocs/front/js/generate-utils.BWefdR0C.js
@@ -0,0 +1 @@
+function e(t=!1){const o=Math.floor(Math.random()*256),r=Math.floor(Math.random()*256),a=Math.floor(Math.random()*256);if(t){const n=Math.floor(Math.random()*100);return`rgb(${o}, ${r}, ${a}, 0.${n})`}return`rgb(${o}, ${r}, ${a})`}export{e as g};
				`@@ -0,0 +1 @@`
				function e(t=!1){const o=Math.floor(Math.random()256),r=Math.floor(Math.random()256),a=Math.floor(Math.random()256);if(t){const n=Math.floor(Math.random()100);return`rgb(${o}, ${r}, ${a}, 0.${n})`}return`rgb(${o}, ${r}, ${a})`}export{e as g};