🔀 Merge remote-tracking branch 'origin/gh-pages' into gh-pages

This commit is contained in:
Maxim Lebedev 2017-07-31 03:34:44 +05:00
commit 7c0bd33988
No known key found for this signature in database
GPG Key ID: F8978F46FF0FFA4F
2 changed files with 3 additions and 3 deletions

View File

@ -32,7 +32,7 @@
# How-To: Translate this thang!
**Step 1)** Fork or download this repo
(if you're forking it, be sure to make sure *your* repo is on a branch called `gh-pages`, so that Github can automatically generate a webpage for it!)
(if you're forking it, be sure to make sure *your* repo is on a branch called `gh-pages`, so that GitHub can automatically generate a webpage for it!)
**Step 2)** Translate the following files:
@ -51,4 +51,4 @@
# "LICENSE"
[Creative Commons Zero](https://github.com/ncase/trust/blob/gh-pages/LICENSE): it's a public domain dedication, so basically, do whatever you want! Attribution is super appreciated, but I'm not gonna send legal goons after you or anything.
[Creative Commons Zero](https://github.com/ncase/trust/blob/gh-pages/LICENSE): it's a public domain dedication, so basically, do whatever you want! Attribution is super appreciated, but I'm not gonna send legal goons after you or anything.

View File

@ -5,7 +5,7 @@ SLIDES.push({
// The tournament simulation
Tournament.resetGlobalVariables();
self.add({id:"tournament", type:"Tournament", x:-20, y:-20},);
self.add({id:"tournament", type:"Tournament", x:-20, y:-20});
// Screw it, just ALL of the Sandbox UI
self.add({id:"sandbox", type:"SandboxUI"});