Skip to content

Commit

Permalink
merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
MathuraMG committed Mar 30, 2017
2 parents f4fb5dd + 8b918d2 commit 5b924f3
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion gridInterceptor/interceptorP5.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ funcNames.forEach(function(x) {
gridInterceptor.populateObject(x, arguments, gridInterceptor.drawObject, details, true);
gridInterceptor.isCleared = false;
} else if (frameCount % 20 == 1) { // reset some of the variables

if (!gridInterceptor.isCleared) {
var cells = document.getElementsByClassName('gridOutput-cell-content');
cells = [].slice.call(cells);
Expand Down

0 comments on commit 5b924f3

Please sign in to comment.