resolve merge conflicts

1 files changed, 10 insertions, 0 deletions

diff --git a/db/migrate/097_add_comment_locale.rb b/db/migrate/097_add_comment_locale.rb
new file mode 100644
index 000000000..92ac7c4a5
--- /dev/null
+++ b/db/migrate/097_add_comment_locale.rb
@@ -0,0 +1,10 @@
+class AddCommentLocale < ActiveRecord::Migration
+    def self.up
+        add_column :comments, :locale, :text, :null => false, :default => ""
+    end
+
+    def self.down
+        remove_column :comments, :locale
+    end
+end
+