gistfile1.txt

mac-raul:dmc raulsouzalima$ git pull origin v206
From github.com:dmcbrazil/dmc
 * branch            v206       -> FETCH_HEAD
Removing app/views/events/jobs/_admin_job.erb
Removing app/views/events/jobs/_list_city.erb
Removing app/views/events/jobs/_tableHeadJobs.erb
Removing app/views/events/jobs/admin.html.erb
Removing app/views/layouts/_main_footer.erb
Removing app/views/layouts/_main_top.erb
Auto-merging config/deploy.rb
CONFLICT (content): Merge conflict in config/deploy.rb
Auto-merging vendor/plugins/inploy/lib/inploy/deploy.rb
CONFLICT (content): Merge conflict in vendor/plugins/inploy/lib/inploy/deploy.rb
Auto-merging vendor/plugins/inploy/lib/inploy/helper.rb
CONFLICT (content): Merge conflict in vendor/plugins/inploy/lib/inploy/helper.rb
Auto-merging vendor/plugins/inploy/lib/inploy/templates/locaweb.rb
CONFLICT (add/add): Merge conflict in vendor/plugins/inploy/lib/inploy/templates/locaweb.rb
Auto-merging vendor/plugins/inploy/spec/shared_examples.rb
CONFLICT (content): Merge conflict in vendor/plugins/inploy/spec/shared_examples.rb
Automatic merge failed; fix conflicts and then commit the result.
mac-raul:dmc raulsouzalima$