whoops, now properly merged

This commit is contained in:
Michael Yang 2014-05-24 15:10:28 -04:00
parent a3b74202b8
commit eebc76cb06

View file

@ -192,7 +192,7 @@ function render() {
}
MainClock.draw();
drawPolygon(canvas.originalWidth / 2 , canvas.originalHeight / 2 , 6, 220, 30, '#f39c12', false,6);
// drawPolygon(canvas.originalWidth / 2 , canvas.originalHeight / 2 , 6, 220, 30, '#f39c12', false,6);
}
function stepInitialLoad() {