Fix: DCache Install and Publish page cache type error

50609ab7 · ETZhangSX · ruanshudong · 3131c079 · 50609ab7 · 50609ab7
Commit 50609ab7 authored 4 years ago by ETZhangSX Committed by ruanshudong 4 years ago
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 100 additions and 0 deletions
+100 -0
--- a/client/dist/adminPass.html
+++ b/client/dist/adminPass.html
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Set Admin Pass</title><link href=/static/css/adminPass.f2fb101e.css rel=preload as=style><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/js/adminPass.6ce9e92c.js rel=preload as=script><link href=/static/js/chunk-common.6b557323.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/adminPass.f2fb101e.css rel=stylesheet></head><body><div id=admin-pass-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.6b557323.js></script><script src=/static/js/adminPass.6ce9e92c.js></script></body></html>
 =======
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Set Admin Pass</title><link href=/static/css/adminPass.f2fb101e.css rel=preload as=style><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/js/adminPass.34dcb370.js rel=preload as=script><link href=/static/js/chunk-common.2122a6a5.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/adminPass.f2fb101e.css rel=stylesheet></head><body><div id=admin-pass-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.2122a6a5.js></script><script src=/static/js/adminPass.34dcb370.js></script></body></html>
 >>>>>>> Fix: DCache Install and Publish page cache type error
 =======
+=======
+>>>>>>> Fix: DCache Install and Publish page cache type error
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Set Admin Pass</title><link href=/static/css/adminPass.f2fb101e.css rel=preload as=style><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/js/adminPass.34dcb370.js rel=preload as=script><link href=/static/js/chunk-common.2122a6a5.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/adminPass.f2fb101e.css rel=stylesheet></head><body><div id=admin-pass-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.2122a6a5.js></script><script src=/static/js/adminPass.34dcb370.js></script></body></html>
 =======
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Set Admin Pass</title><link href=/static/css/adminPass.f2fb101e.css rel=preload as=style><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/js/adminPass.6ce9e92c.js rel=preload as=script><link href=/static/js/chunk-common.6b557323.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/adminPass.f2fb101e.css rel=stylesheet></head><body><div id=admin-pass-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.6b557323.js></script><script src=/static/js/adminPass.6ce9e92c.js></script></body></html>
 >>>>>>> add framework version
+<<<<<<< HEAD
 >>>>>>> add framework version
+=======
+=======
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Set Admin Pass</title><link href=/static/css/adminPass.f2fb101e.css rel=preload as=style><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/js/adminPass.6ce9e92c.js rel=preload as=script><link href=/static/js/chunk-common.6b557323.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/adminPass.f2fb101e.css rel=stylesheet></head><body><div id=admin-pass-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.6b557323.js></script><script src=/static/js/adminPass.6ce9e92c.js></script></body></html>
+=======
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Set Admin Pass</title><link href=/static/css/adminPass.f2fb101e.css rel=preload as=style><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/js/adminPass.34dcb370.js rel=preload as=script><link href=/static/js/chunk-common.2122a6a5.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/adminPass.f2fb101e.css rel=stylesheet></head><body><div id=admin-pass-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.2122a6a5.js></script><script src=/static/js/adminPass.34dcb370.js></script></body></html>
+>>>>>>> Fix: DCache Install and Publish page cache type error
+>>>>>>> Fix: DCache Install and Publish page cache type error
+>>>>>>> Fix: DCache Install and Publish page cache type error
--- a/client/dist/auth.html
+++ b/client/dist/auth.html
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>User Center</title><link href=/static/css/auth.a09076b0.css rel=preload as=style><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/js/auth.1b266c77.js rel=preload as=script><link href=/static/js/chunk-common.6b557323.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/auth.a09076b0.css rel=stylesheet></head><body><div id=auth-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.6b557323.js></script><script src=/static/js/auth.1b266c77.js></script></body></html>
 =======
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>User Center</title><link href=/static/css/auth.a09076b0.css rel=preload as=style><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/js/auth.f4c52f36.js rel=preload as=script><link href=/static/js/chunk-common.2122a6a5.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/auth.a09076b0.css rel=stylesheet></head><body><div id=auth-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.2122a6a5.js></script><script src=/static/js/auth.f4c52f36.js></script></body></html>
 >>>>>>> Fix: DCache Install and Publish page cache type error
 =======
+=======
+>>>>>>> Fix: DCache Install and Publish page cache type error
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>User Center</title><link href=/static/css/auth.a09076b0.css rel=preload as=style><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/js/auth.f4c52f36.js rel=preload as=script><link href=/static/js/chunk-common.2122a6a5.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/auth.a09076b0.css rel=stylesheet></head><body><div id=auth-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.2122a6a5.js></script><script src=/static/js/auth.f4c52f36.js></script></body></html>
 =======
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>User Center</title><link href=/static/css/auth.a09076b0.css rel=preload as=style><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/js/auth.1b266c77.js rel=preload as=script><link href=/static/js/chunk-common.6b557323.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/auth.a09076b0.css rel=stylesheet></head><body><div id=auth-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.6b557323.js></script><script src=/static/js/auth.1b266c77.js></script></body></html>
 >>>>>>> add framework version
+<<<<<<< HEAD
 >>>>>>> add framework version
+=======
+=======
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>User Center</title><link href=/static/css/auth.a09076b0.css rel=preload as=style><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/js/auth.1b266c77.js rel=preload as=script><link href=/static/js/chunk-common.6b557323.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/auth.a09076b0.css rel=stylesheet></head><body><div id=auth-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.6b557323.js></script><script src=/static/js/auth.1b266c77.js></script></body></html>
+=======
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>User Center</title><link href=/static/css/auth.a09076b0.css rel=preload as=style><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/js/auth.f4c52f36.js rel=preload as=script><link href=/static/js/chunk-common.2122a6a5.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/auth.a09076b0.css rel=stylesheet></head><body><div id=auth-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.2122a6a5.js></script><script src=/static/js/auth.f4c52f36.js></script></body></html>
+>>>>>>> Fix: DCache Install and Publish page cache type error
+>>>>>>> Fix: DCache Install and Publish page cache type error
+>>>>>>> Fix: DCache Install and Publish page cache type error
--- a/client/dist/dcache.html
+++ b/client/dist/dcache.html
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <!DOCTYPE html><html lang=en><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=/static/favicon.ico><title>DCache</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/dcache.7284fdbc.css rel=preload as=style><link href=/static/js/chunk-common.6b557323.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/dcache.f75b09a7.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/dcache.7284fdbc.css rel=stylesheet></head><body><noscript><strong>We're sorry but DCache doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.6b557323.js></script><script src=/static/js/dcache.f75b09a7.js></script></body></html>
 =======
 <!DOCTYPE html><html lang=en><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=/static/favicon.ico><title>DCache</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/dcache.7284fdbc.css rel=preload as=style><link href=/static/js/chunk-common.2122a6a5.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/dcache.80993c70.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/dcache.7284fdbc.css rel=stylesheet></head><body><noscript><strong>We're sorry but DCache doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.2122a6a5.js></script><script src=/static/js/dcache.80993c70.js></script></body></html>
 >>>>>>> Fix: DCache Install and Publish page cache type error
 =======
+=======
+>>>>>>> Fix: DCache Install and Publish page cache type error
 <!DOCTYPE html><html lang=en><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=/static/favicon.ico><title>DCache</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/dcache.7284fdbc.css rel=preload as=style><link href=/static/js/chunk-common.2122a6a5.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/dcache.80993c70.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/dcache.7284fdbc.css rel=stylesheet></head><body><noscript><strong>We're sorry but DCache doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.2122a6a5.js></script><script src=/static/js/dcache.80993c70.js></script></body></html>
 =======
 <!DOCTYPE html><html lang=en><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=/static/favicon.ico><title>DCache</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/dcache.7284fdbc.css rel=preload as=style><link href=/static/js/chunk-common.6b557323.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/dcache.bab2e9f4.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/dcache.7284fdbc.css rel=stylesheet></head><body><noscript><strong>We're sorry but DCache doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.6b557323.js></script><script src=/static/js/dcache.bab2e9f4.js></script></body></html>
 >>>>>>> add framework version
+<<<<<<< HEAD
 >>>>>>> add framework version
+=======
+=======
+<!DOCTYPE html><html lang=en><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=/static/favicon.ico><title>DCache</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/dcache.7284fdbc.css rel=preload as=style><link href=/static/js/chunk-common.6b557323.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/dcache.bab2e9f4.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/dcache.7284fdbc.css rel=stylesheet></head><body><noscript><strong>We're sorry but DCache doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.6b557323.js></script><script src=/static/js/dcache.bab2e9f4.js></script></body></html>
+=======
+<!DOCTYPE html><html lang=en><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=/static/favicon.ico><title>DCache</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/dcache.7284fdbc.css rel=preload as=style><link href=/static/js/chunk-common.2122a6a5.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/dcache.80993c70.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/dcache.7284fdbc.css rel=stylesheet></head><body><noscript><strong>We're sorry but DCache doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.2122a6a5.js></script><script src=/static/js/dcache.80993c70.js></script></body></html>
+>>>>>>> Fix: DCache Install and Publish page cache type error
+>>>>>>> Fix: DCache Install and Publish page cache type error
+>>>>>>> Fix: DCache Install and Publish page cache type error
--- a/client/dist/index.html
+++ b/client/dist/index.html
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <!DOCTYPE html><html lang=en><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=/static/favicon.ico><title>Tars</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/index.3e5e8828.css rel=preload as=style><link href=/static/js/chunk-common.6b557323.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/index.3b704088.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/index.3e5e8828.css rel=stylesheet></head><body><noscript><strong>We're sorry but Tars doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.6b557323.js></script><script src=/static/js/index.3b704088.js></script></body></html>
 =======
 <!DOCTYPE html><html lang=en><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=/static/favicon.ico><title>Tars</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/index.1edfd9bd.css rel=preload as=style><link href=/static/js/chunk-common.2122a6a5.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/index.b5e9bcb2.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/index.1edfd9bd.css rel=stylesheet></head><body><noscript><strong>We're sorry but Tars doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.2122a6a5.js></script><script src=/static/js/index.b5e9bcb2.js></script></body></html>
@@ -8,6 +9,8 @@
 =======
 =======
 >>>>>>> auto refresh server list & notify list
+=======
+>>>>>>> Fix: DCache Install and Publish page cache type error
 <!DOCTYPE html><html lang=en><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=/static/favicon.ico><title>Tars</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/index.1edfd9bd.css rel=preload as=style><link href=/static/js/chunk-common.2122a6a5.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/index.b5e9bcb2.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/index.1edfd9bd.css rel=stylesheet></head><body><noscript><strong>We're sorry but Tars doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.2122a6a5.js></script><script src=/static/js/index.b5e9bcb2.js></script></body></html>
 =======
 <!DOCTYPE html><html lang=en><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=/static/favicon.ico><title>Tars</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/index.3e5e8828.css rel=preload as=style><link href=/static/js/chunk-common.6b557323.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/index.b05a74d6.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/index.3e5e8828.css rel=stylesheet></head><body><noscript><strong>We're sorry but Tars doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.6b557323.js></script><script src=/static/js/index.b05a74d6.js></script></body></html>
@@ -18,4 +21,13 @@
 =======
 <!DOCTYPE html><html lang=en><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=/static/favicon.ico><title>Tars</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/index.3e5e8828.css rel=preload as=style><link href=/static/js/chunk-common.6b557323.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/index.3b704088.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/index.3e5e8828.css rel=stylesheet></head><body><noscript><strong>We're sorry but Tars doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.6b557323.js></script><script src=/static/js/index.3b704088.js></script></body></html>
 >>>>>>> auto refresh server list & notify list
+<<<<<<< HEAD
 >>>>>>> auto refresh server list & notify list
+=======
+=======
+<!DOCTYPE html><html lang=en><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=/static/favicon.ico><title>Tars</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/index.3e5e8828.css rel=preload as=style><link href=/static/js/chunk-common.6b557323.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/index.3b704088.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/index.3e5e8828.css rel=stylesheet></head><body><noscript><strong>We're sorry but Tars doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.6b557323.js></script><script src=/static/js/index.3b704088.js></script></body></html>
+=======
+<!DOCTYPE html><html lang=en><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=/static/favicon.ico><title>Tars</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/index.1edfd9bd.css rel=preload as=style><link href=/static/js/chunk-common.2122a6a5.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/index.b5e9bcb2.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/index.1edfd9bd.css rel=stylesheet></head><body><noscript><strong>We're sorry but Tars doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.2122a6a5.js></script><script src=/static/js/index.b5e9bcb2.js></script></body></html>
+>>>>>>> Fix: DCache Install and Publish page cache type error
+>>>>>>> Fix: DCache Install and Publish page cache type error
+>>>>>>> Fix: DCache Install and Publish page cache type error
--- a/client/dist/login.html
+++ b/client/dist/login.html
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Sign in</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/login.c9c6c482.css rel=preload as=style><link href=/static/js/chunk-common.6b557323.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/login.daaeee70.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/login.c9c6c482.css rel=stylesheet></head><body><div id=login-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.6b557323.js></script><script src=/static/js/login.daaeee70.js></script></body></html>
 =======
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Sign in</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/login.c9c6c482.css rel=preload as=style><link href=/static/js/chunk-common.2122a6a5.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/login.998f9ae1.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/login.c9c6c482.css rel=stylesheet></head><body><div id=login-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.2122a6a5.js></script><script src=/static/js/login.998f9ae1.js></script></body></html>
 >>>>>>> Fix: DCache Install and Publish page cache type error
 =======
+=======
+>>>>>>> Fix: DCache Install and Publish page cache type error
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Sign in</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/login.c9c6c482.css rel=preload as=style><link href=/static/js/chunk-common.2122a6a5.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/login.998f9ae1.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/login.c9c6c482.css rel=stylesheet></head><body><div id=login-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.2122a6a5.js></script><script src=/static/js/login.998f9ae1.js></script></body></html>
 =======
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Sign in</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/login.c9c6c482.css rel=preload as=style><link href=/static/js/chunk-common.6b557323.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/login.daaeee70.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/login.c9c6c482.css rel=stylesheet></head><body><div id=login-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.6b557323.js></script><script src=/static/js/login.daaeee70.js></script></body></html>
 >>>>>>> add framework version
+<<<<<<< HEAD
 >>>>>>> add framework version
+=======
+=======
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Sign in</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/login.c9c6c482.css rel=preload as=style><link href=/static/js/chunk-common.6b557323.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/login.daaeee70.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/login.c9c6c482.css rel=stylesheet></head><body><div id=login-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.6b557323.js></script><script src=/static/js/login.daaeee70.js></script></body></html>
+=======
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Sign in</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/login.c9c6c482.css rel=preload as=style><link href=/static/js/chunk-common.2122a6a5.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/login.998f9ae1.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/login.c9c6c482.css rel=stylesheet></head><body><div id=login-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.2122a6a5.js></script><script src=/static/js/login.998f9ae1.js></script></body></html>
+>>>>>>> Fix: DCache Install and Publish page cache type error
+>>>>>>> Fix: DCache Install and Publish page cache type error
+>>>>>>> Fix: DCache Install and Publish page cache type error
--- a/client/dist/pass.html
+++ b/client/dist/pass.html
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Modify Pass</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/pass.aa0ebcdb.css rel=preload as=style><link href=/static/js/chunk-common.6b557323.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/pass.657bbf9c.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/pass.aa0ebcdb.css rel=stylesheet></head><body><div id=pass-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.6b557323.js></script><script src=/static/js/pass.657bbf9c.js></script></body></html>
 =======
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Modify Pass</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/pass.aa0ebcdb.css rel=preload as=style><link href=/static/js/chunk-common.2122a6a5.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/pass.b4396d5f.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/pass.aa0ebcdb.css rel=stylesheet></head><body><div id=pass-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.2122a6a5.js></script><script src=/static/js/pass.b4396d5f.js></script></body></html>
 >>>>>>> Fix: DCache Install and Publish page cache type error
 =======
+=======
+>>>>>>> Fix: DCache Install and Publish page cache type error
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Modify Pass</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/pass.aa0ebcdb.css rel=preload as=style><link href=/static/js/chunk-common.2122a6a5.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/pass.b4396d5f.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/pass.aa0ebcdb.css rel=stylesheet></head><body><div id=pass-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.2122a6a5.js></script><script src=/static/js/pass.b4396d5f.js></script></body></html>
 =======
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Modify Pass</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/pass.aa0ebcdb.css rel=preload as=style><link href=/static/js/chunk-common.6b557323.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/pass.657bbf9c.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/pass.aa0ebcdb.css rel=stylesheet></head><body><div id=pass-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.6b557323.js></script><script src=/static/js/pass.657bbf9c.js></script></body></html>
 >>>>>>> add framework version
+<<<<<<< HEAD
 >>>>>>> add framework version
+=======
+=======
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Modify Pass</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/pass.aa0ebcdb.css rel=preload as=style><link href=/static/js/chunk-common.6b557323.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/pass.657bbf9c.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/pass.aa0ebcdb.css rel=stylesheet></head><body><div id=pass-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.6b557323.js></script><script src=/static/js/pass.657bbf9c.js></script></body></html>
+=======
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Modify Pass</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/pass.aa0ebcdb.css rel=preload as=style><link href=/static/js/chunk-common.2122a6a5.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/pass.b4396d5f.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/pass.aa0ebcdb.css rel=stylesheet></head><body><div id=pass-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.2122a6a5.js></script><script src=/static/js/pass.b4396d5f.js></script></body></html>
+>>>>>>> Fix: DCache Install and Publish page cache type error
+>>>>>>> Fix: DCache Install and Publish page cache type error
+>>>>>>> Fix: DCache Install and Publish page cache type error
--- a/client/dist/register.html
+++ b/client/dist/register.html
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Sign up</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/register.151f1a32.css rel=preload as=style><link href=/static/js/chunk-common.6b557323.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/register.f0af7520.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/register.151f1a32.css rel=stylesheet></head><body><div id=register-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.6b557323.js></script><script src=/static/js/register.f0af7520.js></script></body></html>
 =======
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Sign up</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/register.151f1a32.css rel=preload as=style><link href=/static/js/chunk-common.2122a6a5.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/register.b8de5610.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/register.151f1a32.css rel=stylesheet></head><body><div id=register-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.2122a6a5.js></script><script src=/static/js/register.b8de5610.js></script></body></html>
 >>>>>>> Fix: DCache Install and Publish page cache type error
 =======
+=======
+>>>>>>> Fix: DCache Install and Publish page cache type error
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Sign up</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/register.151f1a32.css rel=preload as=style><link href=/static/js/chunk-common.2122a6a5.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/register.b8de5610.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/register.151f1a32.css rel=stylesheet></head><body><div id=register-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.2122a6a5.js></script><script src=/static/js/register.b8de5610.js></script></body></html>
 =======
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Sign up</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/register.151f1a32.css rel=preload as=style><link href=/static/js/chunk-common.6b557323.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/register.f0af7520.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/register.151f1a32.css rel=stylesheet></head><body><div id=register-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.6b557323.js></script><script src=/static/js/register.f0af7520.js></script></body></html>
 >>>>>>> add framework version
+<<<<<<< HEAD
 >>>>>>> add framework version
+=======
+=======
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Sign up</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/register.151f1a32.css rel=preload as=style><link href=/static/js/chunk-common.6b557323.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/register.f0af7520.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/register.151f1a32.css rel=stylesheet></head><body><div id=register-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.6b557323.js></script><script src=/static/js/register.f0af7520.js></script></body></html>
+=======
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Sign up</title><link href=/static/css/chunk-common.8eab6736.css rel=preload as=style><link href=/static/css/chunk-vendors.3a9a9130.css rel=preload as=style><link href=/static/css/register.151f1a32.css rel=preload as=style><link href=/static/js/chunk-common.2122a6a5.js rel=preload as=script><link href=/static/js/chunk-vendors.93c22adb.js rel=preload as=script><link href=/static/js/register.b8de5610.js rel=preload as=script><link href=/static/css/chunk-vendors.3a9a9130.css rel=stylesheet><link href=/static/css/chunk-common.8eab6736.css rel=stylesheet><link href=/static/css/register.151f1a32.css rel=stylesheet></head><body><div id=register-app></div><script src=/static/js/chunk-vendors.93c22adb.js></script><script src=/static/js/chunk-common.2122a6a5.js></script><script src=/static/js/register.b8de5610.js></script></body></html>
+>>>>>>> Fix: DCache Install and Publish page cache type error
+>>>>>>> Fix: DCache Install and Publish page cache type error
+>>>>>>> Fix: DCache Install and Publish page cache type error
--- a/client/dist/static/js/dcache.80993c70.js
+++ b/client/dist/static/js/dcache.80993c70.js
--- a/client/dist/static/js/dcache.bab2e9f4.js
+++ b/client/dist/static/js/dcache.bab2e9f4.js