resolve conflict
Showing
.env
deleted
100644 → 0
app/assets/javascripts/applied_job.js
0 → 100644
app/assets/stylesheets/_base.scss
0 → 100644
app/assets/stylesheets/applied_job.scss
0 → 100644
app/assets/stylesheets/applied_jobs.scss
0 → 100644
app/assets/stylesheets/common.scss
0 → 100644
app/assets/stylesheets/users.scss
0 → 100644
app/mailers/applied_job_mailer.rb
0 → 100644
app/views/applied_jobs/_errors.html.erb
0 → 100644
app/views/applied_jobs/confirm.html.erb
0 → 100644
app/views/applied_jobs/finish.html.erb
0 → 100644
app/views/applied_jobs/new.html.erb
0 → 100644
test/fixtures/applied_jobs.yml
deleted
100644 → 0
test/fixtures/companies.yml
deleted
100644 → 0
test/fixtures/favorites.yml
deleted
100644 → 0
test/fixtures/histories.yml
deleted
100644 → 0
test/fixtures/industries.yml
deleted
100644 → 0
test/fixtures/jobs.yml
deleted
100644 → 0
test/fixtures/locations.yml
deleted
100644 → 0
test/fixtures/locations_jobs.yml
deleted
100644 → 0
test/fixtures/users.yml
deleted
100644 → 0
test/models/applied_job_test.rb
deleted
100644 → 0
test/models/company_test.rb
deleted
100644 → 0
test/models/favorite_test.rb
deleted
100644 → 0
test/models/history_test.rb
deleted
100644 → 0
test/models/industry_test.rb
deleted
100644 → 0
test/models/job_test.rb
deleted
100644 → 0
test/models/location_test.rb
deleted
100644 → 0
test/models/locations_job_test.rb
deleted
100644 → 0
test/models/user_test.rb
deleted
100644 → 0
Please
register
or
sign in
to comment