fix merge conflict
author Gabriele Cirulli
()
committer Gabriele Cirulli
()
commit 39ebf51ce2b79a68850d611b485b6dee33e39b72
tree b24a3d6aa4cea0fc16d1f1f281d446b3c7836377
parent 3dd8f3e5271a6e090b44b65f1eac6615320ef6bb
parent 77654452a7e70a249cba0a22a3f3ac06ca2296ec
fix merge conflict
index.html
js/application.js
js/game_manager.js
js/html_actuator.js
js/local_score_manager.js [ new file with mode 0644 ]
style/main.css
style/main.scss
comments