|
|
@ -43,15 +43,10 @@ |
|
|
|
|
|
|
|
{% block js %} {% endblock%} |
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
<script type="text/javascript" src="http://code.jquery.com/jquery-2.2.4.js"></script> |
|
|
|
<script type="text/javascript" src="http://code.jquery.com/ui/1.12.0/jquery-ui.js"></script> |
|
|
|
<script type='text/javascript' src='//cdn.jsdelivr.net/jquery.marquee/1.4.0/jquery.marquee.min.js'></script> |
|
|
|
======= |
|
|
|
|
|
|
|
<script src="{{ url_for("static", filename="js/jquery-3.3.1.min.js") }}"></script> |
|
|
|
<script src="{{ url_for("static", filename="js/jquery-ui-1.12.1.custom/jquery-ui.js") }}"></script> |
|
|
|
<script src="{{ url_for("static", filename="js/jquery.marquee.min.js") }}"></script> |
|
|
|
>>>>>>> 0f5e5606ab9152e9d27e7081e251e12a7f33824b |
|
|
|
<script type="text/javascript" src="{{ url_for("static", filename="js/jquery.tablesorter.js") }}"></script> |
|
|
|
<script src="{{ url_for("static", filename="js/app.js") }}"></script> |
|
|
|
|
|
|
|