diff options
| author | Zakaria BOUZIANE | 2014-07-08 16:29:23 +0200 |
|---|---|---|
| committer | Zakaria BOUZIANE | 2014-07-08 16:29:23 +0200 |
| commit | dc541634dd463ade30b802e2a55f1fe27a8dd892 (patch) | |
| tree | 794253d45b387dbc81c4ba4b2d5a03d8353d9a18 /db | |
| parent | a77d67e7807f90ea24e96b5c1a9e6bbb290170b0 (diff) | |
| download | chouette-core-dc541634dd463ade30b802e2a55f1fe27a8dd892.tar.bz2 | |
HUB Export: company and network
Diffstat (limited to 'db')
| -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 |