From 3de3c3542e9c9478f176c0fadc1271260bf13fd1 Mon Sep 17 00:00:00 2001
From: juliandescottes <julian.descottes@gmail.com>
Date: Sat, 23 Nov 2013 19:33:00 +0100
Subject: [PATCH] Post merge fixes

---
 js/service/LocalStorageService.js | 5 -----
 piskel-script-list.js             | 1 -
 2 files changed, 6 deletions(-)

diff --git a/js/service/LocalStorageService.js b/js/service/LocalStorageService.js
index 4fb92114..783211c3 100644
--- a/js/service/LocalStorageService.js
+++ b/js/service/LocalStorageService.js
@@ -45,14 +45,9 @@
    */
   ns.LocalStorageService.prototype.restoreFromLocalStorage_ = function() {
     var framesheet = JSON.parse(window.localStorage.snapShot);
-<<<<<<< HEAD
     pskl.utils.serialization.Deserializer.deserialize(framesheet, function (piskel) {
       pskl.app.piskelController.setPiskel(piskel);
     });
-=======
-    var piskel = pskl.utils.Serializer.createPiskel(framesheet);
-    pskl.app.piskelController.setPiskel(piskel);
->>>>>>> master
   };
 
   /**
diff --git a/piskel-script-list.js b/piskel-script-list.js
index 63c45f9e..9234465c 100644
--- a/piskel-script-list.js
+++ b/piskel-script-list.js
@@ -50,7 +50,6 @@ exports.scripts = [
   "js/rendering/frame/FrameRenderer.js",
   "js/rendering/frame/CachedFrameRenderer.js",
   "js/rendering/CanvasRenderer.js",
-  "js/rendering/FrameRenderer.js",
   "js/rendering/FramesheetRenderer.js",
   "js/rendering/PiskelRenderer.js",