no <<
This commit is contained in:
parent
14e6c357ba
commit
77a76b1b46
1 changed files with 0 additions and 1 deletions
1
main.js
1
main.js
|
@ -14,7 +14,6 @@ clock = new Clock(6);
|
|||
|
||||
var blocks = [];
|
||||
|
||||
<<<<<<< HEAD
|
||||
for (var i = 0; i < 12; i++) {
|
||||
blocks.push(new Block(i, 'green'));
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue