diff options
| author | Jon Reid | 2012-03-15 15:01:15 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-03-15 15:01:15 -0700 |
| commit | 75dd0a2d333be1448f3f8bc0edd10f1c9199f84c (patch) | |
| tree | f3a157f8cd92a8defb47edc68d8881db46f20586 /js/ninja.reel | |
| parent | 21c941bd1fe55e511a72bfa5dc3019748158bd4a (diff) | |
| parent | 68d82cb56cb0235599c46caf349f328f15300fdf (diff) | |
| download | ninja-75dd0a2d333be1448f3f8bc0edd10f1c9199f84c.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-local
Diffstat (limited to 'js/ninja.reel')
| -rwxr-xr-x | js/ninja.reel/ninja.html | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 8f6f6d7b..3dc45498 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
| @@ -399,8 +399,6 @@ | |||
| 399 | 399 | ||
| 400 | <section id="popupWindows"></section> | 400 | <section id="popupWindows"></section> |
| 401 | 401 | ||
| 402 | <div id="modalContainer"></div> | ||
| 403 | |||
| 404 | </div> | 402 | </div> |
| 405 | 403 | ||
| 406 | </body> | 404 | </body> |