Conflicts:

db/tracks-17-blank.db

app/models/dependency.rb

@@ -1,9 +1,7 @@
 class Dependency < ActiveRecord::Base
 
-  belongs_to :todo, 
-    :class_name => "Todo", :foreign_key => "todo_id"
-  belongs_to :predecessor, 
-    :class_name => "Todo", :foreign_key => "predecessor_id"
+  belongs_to :predecessor, :foreign_key => 'predecessor_id', :class_name => 'Todo'
+  belongs_to :successor,   :foreign_key => 'successor_id',   :class_name => 'Todo'
   
 end
 

db/migrate/20090516000646_add_todo_dependencies.rb

@@ -1,7 +1,7 @@
 class AddTodoDependencies < ActiveRecord::Migration
   def self.up
     create_table :dependencies do |t|
-      t.integer :todo_id,          :null => false
+      t.integer :successor_id,     :null => false
       t.integer :predecessor_id,   :null => false
       t.string  :relationship_type
     end