Resolve merge conflict

This commit is contained in:
Gnome Ann 2021-11-05 11:03:50 -04:00
parent 81bd058caf
commit 7ea6f58b1a

View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<script src="static/jquery-3.6.0.min.js"></script>
<script src="static/socket.io.min.js"></script>
<script src="static/application.js?ver=1.16.3ub"></script>
<script src="static/application.js?ver=1.16.3uc"></script>
<script src="static/bootstrap.min.js"></script>
<script src="static/bootstrap-toggle.min.js"></script>
<script src="static/rangy-core.min.js"></script>