Fix "Resolve conflicts in user activity"

353e43b4 · Nick Thomas · 409ed365 · 353e43b4 · 353e43b4
Commit 353e43b4 authored Apr 20, 2017 by Nick Thomas
2 changed files
--- a/db/migrate/20161007073613_create_user_activities.rb
+++ b/db/migrate/20161007073613_create_user_activities.rb
@@ -25,4 +25,3 @@ class CreateUserActivities < ActiveRecord::Migration
    end
  end
 end
-
--- a/db/post_migrate/20161128170531_drop_user_activities_table.rb
+++ b/db/post_migrate/20161128170531_drop_user_activities_table.rb
@@ -32,4 +32,3 @@ class DropUserActivitiesTable < ActiveRecord::Migration
    end
  end
 end
-