gistfile1.txt

mac-raul:dmc raulsouzalima$ git status
# On branch v206
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   README.md
#	modified:   app/controllers/events/budgets_controller.rb
#	modified:   app/controllers/events/jobs_controller.rb
#	modified:   app/controllers/report/reportinvestments_controller.rb
#	modified:   app/controllers/setup/minisites_controller.rb
#	modified:   app/helpers/application_helper.rb
#	modified:   app/helpers/events/budgets_helper.rb
#	modified:   app/helpers/events/jobs_helper.rb
#	modified:   app/models/company.rb
#	modified:   app/views/admin/agencies/index.html.erb
#	modified:   app/views/admin/styles/show.css.erb
#	new file:   app/views/events/budgets/_budget_category_subtotal.erb
#	modified:   app/views/events/budgets/_budget_item.erb
#	modified:   app/views/events/budgets/_budget_subtotal.erb
#	new file:   app/views/events/budgets/_show_budget_category_subtotal.erb
#	modified:   app/views/events/budgets/_show_budget_item.erb
#	modified:   app/views/events/budgets/_show_budget_subtotal.erb
#	modified:   app/views/events/budgets/_values_header.erb
#	new file:   app/views/events/budgets/_xls_budget_category_subtotal.erb
#	modified:   app/views/events/budgets/_xls_budget_item.erb
#	modified:   app/views/events/budgets/_xls_budget_subtotal.erb
#	modified:   app/views/events/budgets/show.html.erb
#	modified:   app/views/events/budgets/show.pdf.prawn
#	modified:   app/views/events/budgets/show.xls.erb
#	modified:   app/views/events/budgets/values.html.erb
#	deleted:    app/views/events/jobs/_admin_job.erb
#	modified:   app/views/events/jobs/_form.erb
#	modified:   app/views/events/jobs/_job.erb
#	deleted:    app/views/events/jobs/_list_city.erb
#	modified:   app/views/events/jobs/_search.erb
#	deleted:    app/views/events/jobs/_tableHeadJobs.erb
#	modified:   app/views/events/jobs/add_city.rjs
#	deleted:    app/views/events/jobs/admin.html.erb
#	modified:   app/views/events/jobs/edit.html.erb
#	modified:   app/views/events/jobs/index.html.erb
#	modified:   app/views/events/jobs/new.html.erb
#	modified:   app/views/events/jobs/status.html.erb
#	modified:   app/views/events/minisites/_form.erb
#	modified:   app/views/events/minisites/new.html.erb
#	modified:   app/views/events/minisites/show.html.erb
#	deleted:    app/views/layouts/_main_footer.erb
#	deleted:    app/views/layouts/_main_top.erb
#	modified:   app/views/layouts/_menu_job.erb
#	modified:   app/views/layouts/_menu_job_production.erb
#	modified:   app/views/layouts/main.html.erb
#	modified:   app/views/sessions/index.html.erb
#	modified:   app/views/setup/currencies/index.html.erb
#	modified:   app/views/setup/members/_list.erb
#	modified:   app/views/setup/minisites/_form.erb
#	modified:   app/views/shared/_extra_menu_job.erb
#	modified:   config/locales/en.rb
#	modified:   config/locales/pt-BR.rb
#	modified:   config/routes.rb
#	modified:   features/manage_currencies.feature
#	new file:   features/step_definitions/budgets_steps.rb
#	modified:   features/step_definitions/currency_steps.rb
#	modified:   features/support/paths.rb
#	new file:   features/user_budgets.feature
#	modified:   lib/main_titles.rb
#	modified:   public/stylesheets/default.css
#	modified:   public/stylesheets/form.css
#	modified:   public/stylesheets/timetable.css
#	modified:   spec/factories/factories.rb
#	modified:   vendor/plugins/inploy/lib/inploy.rb
#	new file:   vendor/plugins/inploy/lib/inploy/dsl.rb
#	new file:   vendor/plugins/inploy/spec/dsl_spec.rb
#
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add <file>..." to mark resolution)
#
#	both modified:      config/deploy.rb
#	both modified:      vendor/plugins/inploy/lib/inploy/deploy.rb
#	both modified:      vendor/plugins/inploy/lib/inploy/helper.rb
#	both added:         vendor/plugins/inploy/lib/inploy/templates/locaweb.rb
#	both modified:      vendor/plugins/inploy/spec/shared_examples.rb
#
mac-raul:dmc raulsouzalima$