合并冲突

2018-08-14 17:45:18 +08:00 · 2018-08-14 17:45:18 +08:00 · aa20e12803
parent ec093c60dd b7a58396fd
commit aa20e12803
2 changed files with 23 additions and 23 deletions
--- a/web/static_assets.go
+++ b/web/static_assets.go
--- a/web/ui/index.html
+++ b/web/ui/index.html
@ -61,7 +61,7 @@
  <div id="app">
    <div id="initloader"></div>
  </div>
-  <script src="build.js?v=a6c81b2"></script>
+  <script src="build.js?v=9bb382d"></script>
 </body>

 </html>