|
@@ -1 +1,5 @@
|
|
|
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.ff83cc1b.js"></script><script defer="defer" type="module" src="js/app.e468cfea.js"></script><link href="css/app.b6b742d4.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.3730eb53.js" nomodule></script><script defer="defer" src="js/app-legacy.8a68c54e.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
|
|
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
|
|
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.ff83cc1b.js"></script><script defer="defer" type="module" src="js/app.e468cfea.js"></script><link href="css/app.b6b742d4.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.3730eb53.js" nomodule></script><script defer="defer" src="js/app-legacy.8a68c54e.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
|
|
|
|
|
+=======
|
|
|
|
|
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.ff83cc1b.js"></script><script defer="defer" type="module" src="js/app.1e2e404e.js"></script><link href="css/app.b6b742d4.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.3730eb53.js" nomodule></script><script defer="defer" src="js/app-legacy.6b471e68.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
|
|
|
|
|
+>>>>>>> 76c13d87af996176e7fbf4ede73bbfacb9575313
|
zhangqiOMG