removed conflicts

Conflicts: src/layer/Layer.js
rezoner · Mar 8, 2017 · ee2707e · ee2707e
2 parents 256018a + 5f1080f
commit ee2707e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Keyboard.js b/src/Keyboard.js
@@ -255,4 +255,4 @@ PLAYGROUND.Keyboard.prototype = {
 
 };
 
-PLAYGROUND.Utils.extend(PLAYGROUND.Keyboard.prototype, PLAYGROUND.Events.prototype);
+PLAYGROUND.Utils.extend(PLAYGROUND.Keyboard.prototype, PLAYGROUND.Events.prototype);
diff --git a/src/layer/Layer.js b/src/layer/Layer.js
@@ -97,4 +97,4 @@ PLAYGROUND.Canvas.prototype = {
 
   }
 
-};
+};