gistfile1

~/workspace/credere(branch:dev) ? git merge new_customers_form                                                                                                          sanderson@ssantana-mpb
Auto-merging spec/requests/customers_spec.rb
Removing public/.DS_Store
Auto-merging app/views/proposals/_form.html.erb
CONFLICT (content): Merge conflict in app/views/proposals/_form.html.erb
Auto-merging app/views/customers/old_parentesco.html.erb
Auto-merging app/views/customers/old_informacoes_bancarias_complementares.html.erb
Auto-merging app/views/customers/old_informacoes_bancarias.html.erb
Auto-merging app/views/customers/old_dados_profissionais.html.erb
Auto-merging app/views/customers/old_cpf.html.erb
Auto-merging app/views/customers/_form.html.erb
CONFLICT (content): Merge conflict in app/views/customers/_form.html.erb
Removing app/views/customers/_customer_show_actions.html.erb
Auto-merging app/assets/stylesheets/style.css.erb
CONFLICT (content): Merge conflict in app/assets/stylesheets/style.css.erb
Auto-merging app/assets/stylesheets/all/grid.css
CONFLICT (add/add): Merge conflict in app/assets/stylesheets/all/grid.css
Removing app/assets/stylesheets/all/.DS_Store
Removing app/assets/stylesheets/.DS_Store
Auto-merging app/assets/javascripts/script.js
CONFLICT (content): Merge conflict in app/assets/javascripts/script.js
Auto-merging app/assets/javascripts/qunit/helpers.js
CONFLICT (content): Merge conflict in app/assets/javascripts/qunit/helpers.js
Auto-merging app/assets/javascripts/controllers/customers.js
Removing app/assets/images/novidades/.DS_Store
Removing app/assets/images/mail/.DS_Store
Removing app/assets/.DS_Store
Auto-merging Gemfile.lock
Auto-merging Gemfile
Automatic merge failed; fix conflicts and then commit the result.