spec/dummy/db/schema.rb in enju_ndl-0.1.0.pre31 vs spec/dummy/db/schema.rb in enju_ndl-0.1.0.pre32

@@ -609,17 +609,12 @@
     t.text     "volume_number_transcription_string"
     t.boolean  "series_master"
     t.integer  "root_manifestation_id"
   end
 
-<<<<<<< HEAD
   add_index "series_statements", ["manifestation_id"], :name => "index_series_statements_on_manifestation_id"
+  add_index "series_statements", ["root_manifestation_id"], :name => "index_series_statements_on_root_manifestation_id"
   add_index "series_statements", ["series_statement_identifier"], :name => "index_series_statements_on_series_statement_identifier"
-=======
-  add_index "series_statements", ["manifestation_id"], name: "index_series_statements_on_manifestation_id"
-  add_index "series_statements", ["root_manifestation_id"], name: "index_series_statements_on_root_manifestation_id"
-  add_index "series_statements", ["series_statement_identifier"], name: "index_series_statements_on_series_statement_identifier"
->>>>>>> 004f156... only import books
 
   create_table "subject_has_classifications", :force => true do |t|
     t.integer  "subject_id"
     t.string   "subject_type"
     t.integer  "classification_id", :null => false