Merge branch 'issues/1416-csv-update-public-bodies' into rails-3-develop

1 files changed, 18 insertions, 19 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index e63ce8129..d75622b37 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,26 +1,25 @@
 # == Schema Information
-# Schema version: 20131024114346
 #
 # Table name: users
 #
-#  id                     :integer          not null, primary key
-#  email                  :string(255)      not null
-#  name                   :string(255)      not null
-#  hashed_password        :string(255)      not null
-#  salt                   :string(255)      not null
-#  created_at             :datetime         not null
-#  updated_at             :datetime         not null
-#  email_confirmed        :boolean          default(FALSE), not null
-#  url_name               :text             not null
-#  last_daily_track_email :datetime         default(2000-01-01 00:00:00 UTC)
-#  admin_level            :string(255)      default("none"), not null
-#  ban_text               :text             default(""), not null
-#  about_me               :text             default(""), not null
-#  locale                 :string(255)
-#  email_bounced_at       :datetime
-#  email_bounce_message   :text             default(""), not null
-#  no_limit               :boolean          default(FALSE), not null
-#  receive_email_alerts   :boolean          default(TRUE), not null
+#  id                      :integer          not null, primary key
+#  email                   :string(255)      not null
+#  name                    :string(255)      not null
+#  hashed_password         :string(255)      not null
+#  salt                    :string(255)      not null
+#  created_at              :datetime         not null
+#  updated_at              :datetime         not null
+#  email_confirmed         :boolean          default(FALSE), not null
+#  url_name                :text             not null
+#  last_daily_track_email  :datetime         default(Sat Jan 01 00:00:00 UTC 2000)
+#  admin_level             :string(255)      default("none"), not null
+#  ban_text                :text             default(""), not null
+#  about_me                :text             default(""), not null
+#  locale                  :string(255)
+#  email_bounced_at        :datetime
+#  email_bounce_message    :text             default(""), not null
+#  no_limit                :boolean          default(FALSE), not null
+#  receive_email_alerts    :boolean          default(TRUE), not null
 #  can_make_batch_requests :boolean          default(FALSE), not null
 #