Merge branch 'reference_types' into action_events

GerryG · Dec 14, 2012 · 97f8820 · 97f8820
2 parents fe39af9 + 8e093d0
commit 97f8820
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/db/schema.rb b/db/schema.rb
@@ -11,16 +11,15 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20121118114000) do
+ActiveRecord::Schema.define(:version => 20121111025347) do
 
   create_table "card_references", :force => true do |t|
     t.datetime "created_at",                                      :null => false
     t.datetime "updated_at",                                      :null => false
     t.integer  "card_id",                         :default => 0,  :null => false
     t.string   "referenced_name",                 :default => "", :null => false
     t.integer  "referenced_card_id"
-    t.string   "ref_type",           :limit => 1, :default => "", :null => false
-    t.integer  "present"
+    t.string   "link_type",          :limit => 1, :default => "", :null => false
   end
 
   add_index "card_references", ["card_id"], :name => "wiki_references_card_id"