merge conflct
commit 34fbe70511e59fed7073c3a8ca6d3859c974714c
2 parents 31cbea0 + 6faf7a6
Yo Otaki otaki (Yo Otaki) authored on 28 Feb 2024
Showing 3 changed files
View
flask/testapp/static/javascript/beautyVote.js
View
flask/testapp/static/javascript/resultScreen.js
View
flask/testapp/templates/testapp/showResultJPN.html