gistfile1.txt

Auto-merging vagrant/util/admin_db_restore
CONFLICT (content): Merge conflict in vagrant/util/admin_db_restore
Auto-merging vagrant/Vagrantfile
CONFLICT (content): Merge conflict in vagrant/Vagrantfile
Auto-merging admin/test/unit/messages_test.rb
CONFLICT (content): Merge conflict in admin/test/unit/messages_test.rb
Auto-merging admin/test/unit/message_group_test.rb
Auto-merging admin/test/unit/image_test.rb
Auto-merging admin/test/test_helper.rb
Auto-merging admin/test/integration/api_integration_test.rb
CONFLICT (content): Merge conflict in admin/test/integration/api_integration_test.rb
Auto-merging admin/test/functional/string_values_controller_test.rb
Auto-merging admin/test/functional/move_record_test.rb
Auto-merging admin/test/functional/messages_controller_test.rb
Auto-merging admin/test/functional/message_types_controller_test.rb
Auto-merging admin/test/functional/message_groups_controller_test.rb
Auto-merging admin/test/functional/exports_controller_test.rb
Auto-merging admin/test/functional/entities_controller_test.rb
Auto-merging admin/test/functional/day_parts_controller_test.rb
Auto-merging admin/test/functional/cycle_menus_controller_test.rb
Auto-merging admin/test/functional/component_groups_controller_test.rb
Auto-merging admin/config/environment.rb
Auto-merging admin/app/views/items/_targeting.html.erb
Auto-merging admin/app/models/report.rb
Auto-merging admin/app/models/message.rb
Auto-merging admin/app/models/item.rb
Auto-merging admin/app/models/entity.rb
Auto-merging admin/app/models/ar_helpers.rb
Auto-merging admin/app/helpers/reports_helper.rb
Auto-merging admin/app/helpers/messages_helper.rb
CONFLICT (content): Merge conflict in admin/app/helpers/messages_helper.rb
Auto-merging admin/app/controllers/items_controller.rb
Auto-merging admin/app/controllers/application_controller.rb
Auto-merging admin/app/controllers/api/items_controller.rb
Auto-merging admin/Rakefile
Auto-merging admin/Gemfile.lock
CONFLICT (content): Merge conflict in admin/Gemfile.lock
Auto-merging admin/Gemfile
CONFLICT (content): Merge conflict in admin/Gemfile
Automatic merge failed; fix conflicts and then commit the result.