Added migration for license field, resolved conflict in db/sql/models.py

1 files changed, 18 insertions, 1 deletions

diff --git a/mediagoblin/db/sql/open.py b/mediagoblin/db/sql/open.py
index c682bd3b..3c06c676 100644
--- a/mediagoblin/db/sql/open.py
+++ b/mediagoblin/db/sql/open.py
@@ -1,3 +1,20 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011,2012 MediaGoblin contributors.  See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
 from sqlalchemy import create_engine
 
 from mediagoblin.db.sql.base import Session
@@ -8,7 +25,7 @@ class DatabaseMaster(object):
     def __init__(self, engine):
         self.engine = engine
 
-        for k,v in Base._decl_class_registry.iteritems():
+        for k, v in Base._decl_class_registry.iteritems():
             setattr(self, k, v)
 
     def commit(self):