resolve merge conflicts

2022-06-10 08:59:22 -05:00
parent cd4257f13e 3a0efe3eeb
commit e4899d2494
126 changed files with 1459 additions and 299 deletions
--- a/benchcoach/templates/base.html
+++ b/benchcoach/templates/base.html
@@ -28,8 +28,6 @@
    <!-- Your stuff: Third-party javascript libraries go here -->

    <!-- place project specific Javascript in this file -->
-    <script defer src="{% static 'js/project.js' %}"></script>
-    <script defer src="{% static 'js/Sortable.js' %}"></script>
    <script src="{% static 'js/chart.js' %}"></script>

  {% endblock javascript %}