Permalink
Browse files

Resolved merge conflict

  • Loading branch information...
2 parents 2d93e32 + 9dc323a commit 7ac5be06cb09c94e91dbeb7f8f26672747c3115e @nehasinha nehasinha committed Nov 17, 2011
Showing with 10 additions and 8 deletions.
  1. +2 −0 db/schema.rb
  2. +8 −8 db/seeds.rb
View
@@ -154,8 +154,10 @@
end
#add_index "faculty_assignments", ["course_id", "person_id"], :name => "index_courses_people_on_course_id_and_person_id", :unique => true
+
# add_index "faculty_assignments", ["course_id", "person_id"], :name => "index_faculty_assignments_on_course_id_and_person_id", :unique => true
+
create_table "page_comment_types", :force => true do |t|
t.string "name"
t.string "background_color"
View
@@ -133,18 +133,18 @@
end
-Factory.define :your_name_here, :parent => :person do |p|
+Factory.define :swapna, :parent => :person do |p|
p.is_student 1
p.is_part_time 0
p.graduation_year "2012"
p.masters_program "SE"
p.masters_track "Tech"
- p.twiki_name "FirstLast"
- p.first_name "First"
- p.last_name "Last"
- p.human_name "Your Name"
- p.email "your.email@sv.cmu.edu"
- p.webiso_account "your.name@andrew.cmu.edu"
+ p.twiki_name "SwapnaVarghese"
+ p.first_name "Swapna"
+ p.last_name "Varghese"
+ p.human_name "Swapna Varghese"
+ p.email "swapna.varghese@sv.cmu.edu"
+ p.webiso_account "svarghes@andrew.cmu.edu"
end
Factory.define :neha, :parent => :person do |p|
@@ -169,7 +169,7 @@
todd = Factory.create(:todd)
ed = Factory.create(:ed)
-Factory.create(:your_name_here)
+Factory.create(:swapna)
Factory.create(:team_terrific) #This will create awe_smith, betty_ross, and charlie_moss

0 comments on commit 7ac5be0

Please sign in to comment.