diff options
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/db/schema.rb b/db/schema.rb index 1d3d2aa24..343ccdceb 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,11 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -<<<<<<< HEAD ActiveRecord::Schema.define(:version => 20140626081658) do -======= -ActiveRecord::Schema.define(:version => 20140618072859) do ->>>>>>> tad_pmr create_table "access_links", :force => true do |t| t.integer "access_point_id", :limit => 8 |