From 45a06ca96f1598927aa5c08df66cf88a68e1ea1c Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Sun, 11 Dec 2011 12:31:51 +0530
Subject: [PATCH] test commit

---
 edgware/files/models.py     | 2 +-
 edgware/static/js/editor.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/edgware/files/models.py b/edgware/files/models.py
index 12b1395..fada7cd 100755
--- a/edgware/files/models.py
+++ b/edgware/files/models.py
@@ -232,7 +232,7 @@ class File(models.Model):
 class Category(models.Model):
   name = models.CharField(max_length=255)
   groups = models.ManyToManyField(Group, null=True)
-# descriotion = models.TextField(blank=True)
+# description = models.TextField(blank=True)
 #  folder_name = models.CharField(max_length=512)
 
   def __unicode__(self):
diff --git a/edgware/static/js/editor.js b/edgware/static/js/editor.js
index de51fdf..323b1fb 100644
--- a/edgware/static/js/editor.js
+++ b/edgware/static/js/editor.js
@@ -243,6 +243,7 @@ var Canvas = function(opts, json) {
   if (typeof json != 'undefined') {
     this.loadFromJSON(json);
     } else {
+    $.noop();
     }
   return this;