CE->EE: Fix conflicts in app/models/project_import_data.rb

app/models/project_import_data.rb

 require 'carrierwave/orm/activerecord'
 
 class ProjectImportData < ActiveRecord::Base
-<<<<<<< HEAD
   prepend ::EE::ProjectImportData
 
-=======
->>>>>>> upstream/master
   belongs_to :project, inverse_of: :import_data
   attr_encrypted :credentials,
                  key: Gitlab::Application.secrets.db_key_base,