foo

--(jadams@viggyviggy)-(5/pts/0)-(2024/26-May-11)--
--($:~/rails/refinerycms)(rails-3-1)ruby-1.9.2-p180@refienrycms-- 
$ git merge resolve/master
Auto-merging Gemfile
CONFLICT (content): Merge conflict in Gemfile
Auto-merging Gemfile.lock
CONFLICT (content): Merge conflict in Gemfile.lock
Auto-merging authentication/refinerycms-authentication.gemspec
CONFLICT (content): Merge conflict in authentication/refinerycms-authentication.gemspec
Auto-merging base/refinerycms-base.gemspec
CONFLICT (content): Merge conflict in base/refinerycms-base.gemspec
Auto-merging changelog.md
CONFLICT (content): Merge conflict in changelog.md
CONFLICT (delete/modify): core/app/controllers/admin/dialogs_controller.rb deleted in HEAD and modified in resolve/master. Version resolve/master of core/app/controllers/admin/dialogs_controller.rb left in tree.
CONFLICT (delete/modify): core/app/controllers/sitemap_controller.rb deleted in HEAD and modified in resolve/master. Version resolve/master of core/app/controllers/sitemap_controller.rb left in tree.
Auto-merging core/app/views/shared/_header.html.erb
Auto-merging core/app/views/shared/_menu.html.erb
CONFLICT (content): Merge conflict in core/app/views/shared/_menu.html.erb
Auto-merging core/lib/gemspec.rb
Auto-merging core/lib/generators/refinerycms_generator.rb
Auto-merging core/lib/refinery/helpers/site_bar_helper.rb
CONFLICT (content): Merge conflict in core/lib/refinery/helpers/site_bar_helper.rb
Auto-merging core/lib/refinerycms-core.rb
Auto-merging core/refinerycms-core.gemspec
CONFLICT (content): Merge conflict in core/refinerycms-core.gemspec
Auto-merging dashboard/app/views/refinery/admin/dashboard/_actions.html.erb
Auto-merging dashboard/refinerycms-dashboard.gemspec
CONFLICT (content): Merge conflict in dashboard/refinerycms-dashboard.gemspec
Auto-merging db/seeds/pages.rb
CONFLICT (content): Merge conflict in db/seeds/pages.rb
Auto-merging doc/guides/1 - Getting Started/1 - Getting Started with Refinery.textile
Auto-merging images/refinerycms-images.gemspec
CONFLICT (content): Merge conflict in images/refinerycms-images.gemspec
CONFLICT (delete/modify): pages/app/controllers/admin/pages_controller.rb deleted in HEAD and modified in resolve/master. Version resolve/master of pages/app/controllers/admin/pages_controller.rb left in tree.
CONFLICT (delete/modify): pages/app/models/page.rb deleted in HEAD and modified in resolve/master. Version resolve/master of pages/app/models/page.rb left in tree.
Auto-merging pages/app/views/refinery/admin/pages/_form.html.erb
Auto-merging pages/app/views/refinery/admin/pages/_page.html.erb
Auto-merging pages/features/step_definitions/page_steps.rb
CONFLICT (content): Merge conflict in pages/features/step_definitions/page_steps.rb
Auto-merging pages/lib/refinery/pages/instance_methods.rb
CONFLICT (content): Merge conflict in pages/lib/refinery/pages/instance_methods.rb
Auto-merging pages/refinerycms-pages.gemspec
CONFLICT (content): Merge conflict in pages/refinerycms-pages.gemspec
Auto-merging pages/spec/models/page_spec.rb
CONFLICT (content): Merge conflict in pages/spec/models/page_spec.rb
Auto-merging refinerycms.gemspec
CONFLICT (content): Merge conflict in refinerycms.gemspec
Auto-merging resources/refinerycms-resources.gemspec
CONFLICT (content): Merge conflict in resources/refinerycms-resources.gemspec
Auto-merging settings/refinerycms-settings.gemspec
CONFLICT (content): Merge conflict in settings/refinerycms-settings.gemspec
Auto-merging testing/lib/gemspec.rb
Auto-merging testing/refinerycms-testing.gemspec
CONFLICT (content): Merge conflict in testing/refinerycms-testing.gemspec
Automatic merge failed; fix conflicts and then commit the result.