Merge branch 'master' of github.com:DancingBanana/game-off-2012

Conflicts: public/css/global.css
DancingBanana · Dec 1, 2012 · 1011168 · 1011168
2 parents 8f2c1c6 + 02b477a
commit 1011168
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/public/css/global.css b/public/css/global.css
@@ -194,7 +194,7 @@ body {
  background: url('../img/level-asset-background-01.png?1354380842');
 }
 #gamescape.level2 {
- background: url('../img/level-asset-background-02-dev.png?1354380842');
+ background: url('../img/level-asset-background-02.png?1354380842');
 }
 #gamescape.level3 {
  background: url('../img/level-asset-background-03.png?1354380842');

diff --git a/public/sass/global.scss b/public/sass/global.scss
@@ -203,7 +203,7 @@ body {
  @include background(image-url('level-asset-background-01.png'));
 
  &.level2 {
- @include background(image-url('level-asset-background-02-dev.png'));
+ @include background(image-url('level-asset-background-02.png'));
  }
 
  &.level3 {