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/teamsnap/forms.py
+++ b/teamsnap/forms.py
@@ -46,7 +46,7 @@ class LineupEntryForm(forms.Form):
            ("DR", "DR"),
            ("EH", "EH"),
        ],
-        widget=forms.Select(attrs={"onchange": "colorPositions();"}),
+        widget=forms.Select(attrs={"onchange": "positionSelectChanged(this);"}),
    )