refinerycms

Auto-merging .gems
CONFLICT (add/add): Merge conflict in .gems
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging Rakefile
CONFLICT (add/add): Merge conflict in Rakefile
Auto-merging VERSION
CONFLICT (add/add): Merge conflict in VERSION
Auto-merging config/application.rb
CONFLICT (add/add): Merge conflict in config/application.rb
Auto-merging config/boot.rb
CONFLICT (add/add): Merge conflict in config/boot.rb
Auto-merging config/environments/development.rb
CONFLICT (add/add): Merge conflict in config/environments/development.rb
Auto-merging config/environments/production.rb
CONFLICT (add/add): Merge conflict in config/environments/production.rb
Auto-merging config/preinitializer.rb
CONFLICT (add/add): Merge conflict in config/preinitializer.rb
Auto-merging config/routes.rb
CONFLICT (add/add): Merge conflict in config/routes.rb
Auto-merging db/schema.rb
CONFLICT (add/add): Merge conflict in db/schema.rb
Auto-merging db/seeds.rb
CONFLICT (add/add): Merge conflict in db/seeds.rb
Auto-merging lib/refinery/tasks/refinery.rake
CONFLICT (add/add): Merge conflict in lib/refinery/tasks/refinery.rake
Auto-merging public/images/refinery/admin_bg.png
CONFLICT (add/add): Merge conflict in public/images/refinery/admin_bg.png
Auto-merging public/javascripts/refinery/admin.js
CONFLICT (add/add): Merge conflict in public/javascripts/refinery/admin.js
Auto-merging public/javascripts/refinery/boot_wym.js
CONFLICT (add/add): Merge conflict in public/javascripts/refinery/boot_wym.js
Auto-merging public/javascripts/wymeditor/jquery.refinery.wymeditor.js
CONFLICT (add/add): Merge conflict in public/javascripts/wymeditor/jquery.refinery.wymeditor.js
Auto-merging public/javascripts/wymeditor/lang/en.js
CONFLICT (add/add): Merge conflict in public/javascripts/wymeditor/lang/en.js
Auto-merging public/javascripts/wymeditor/lang/fa.js
CONFLICT (add/add): Merge conflict in public/javascripts/wymeditor/lang/fa.js
Auto-merging public/javascripts/wymeditor/skins/refinery/skin.js
CONFLICT (add/add): Merge conflict in public/javascripts/wymeditor/skins/refinery/skin.js
Auto-merging public/robots.txt
CONFLICT (add/add): Merge conflict in public/robots.txt
Auto-merging public/stylesheets/application.css
CONFLICT (add/add): Merge conflict in public/stylesheets/application.css
Auto-merging public/stylesheets/formatting.css
CONFLICT (add/add): Merge conflict in public/stylesheets/formatting.css
Auto-merging public/stylesheets/home.css
CONFLICT (add/add): Merge conflict in public/stylesheets/home.css
Auto-merging public/stylesheets/ie7.css
Auto-merging public/stylesheets/refinery/application.css
CONFLICT (add/add): Merge conflict in public/stylesheets/refinery/application.css
Auto-merging public/stylesheets/refinery/formatting.css
CONFLICT (add/add): Merge conflict in public/stylesheets/refinery/formatting.css
Auto-merging public/stylesheets/refinery/refinery.css
CONFLICT (add/add): Merge conflict in public/stylesheets/refinery/refinery.css
Auto-merging public/stylesheets/refinery/theme.css
CONFLICT (add/add): Merge conflict in public/stylesheets/refinery/theme.css
Auto-merging public/stylesheets/refinery/tooltips.css
CONFLICT (add/add): Merge conflict in public/stylesheets/refinery/tooltips.css
Auto-merging public/stylesheets/wymeditor/skins/refinery/skin.css
CONFLICT (add/add): Merge conflict in public/stylesheets/wymeditor/skins/refinery/skin.css
Auto-merging public/stylesheets/wymeditor/skins/refinery/wymiframe.css
CONFLICT (add/add): Merge conflict in public/stylesheets/wymeditor/skins/refinery/wymiframe.css
Auto-merging readme.md
CONFLICT (add/add): Merge conflict in readme.md
Auto-merging script/about
CONFLICT (add/add): Merge conflict in script/about
Auto-merging script/console
CONFLICT (add/add): Merge conflict in script/console
Auto-merging script/dbconsole
CONFLICT (add/add): Merge conflict in script/dbconsole
Auto-merging script/destroy
CONFLICT (add/add): Merge conflict in script/destroy
Auto-merging script/generate
CONFLICT (add/add): Merge conflict in script/generate
Auto-merging script/performance/benchmarker
CONFLICT (add/add): Merge conflict in script/performance/benchmarker
Auto-merging script/performance/profiler
CONFLICT (add/add): Merge conflict in script/performance/profiler
Auto-merging script/performance/request
CONFLICT (add/add): Merge conflict in script/performance/request
Auto-merging script/plugin
CONFLICT (add/add): Merge conflict in script/plugin
Auto-merging script/process/inspector
CONFLICT (add/add): Merge conflict in script/process/inspector
Auto-merging script/process/reaper
CONFLICT (add/add): Merge conflict in script/process/reaper
Auto-merging script/process/spawner
CONFLICT (add/add): Merge conflict in script/process/spawner
Auto-merging script/runner
CONFLICT (add/add): Merge conflict in script/runner
Auto-merging script/server
CONFLICT (add/add): Merge conflict in script/server
Auto-merging themes/demolicious/stylesheets/application.css
CONFLICT (add/add): Merge conflict in themes/demolicious/stylesheets/application.css
Auto-merging themes/demolicious/stylesheets/formatting.css
CONFLICT (add/add): Merge conflict in themes/demolicious/stylesheets/formatting.css
Auto-merging themes/demolicious/views/layouts/application.html.erb
CONFLICT (add/add): Merge conflict in themes/demolicious/views/layouts/application.html.erb
Auto-merging themes/demolicious/views/pages/home.html.erb
CONFLICT (add/add): Merge conflict in themes/demolicious/views/pages/home.html.erb
Auto-merging themes/hemingway/stylesheets/application.css
CONFLICT (add/add): Merge conflict in themes/hemingway/stylesheets/application.css
Auto-merging themes/hemingway/views/layouts/application.html.erb
CONFLICT (add/add): Merge conflict in themes/hemingway/views/layouts/application.html.erb
Automatic merge failed; fix conflicts and then commit the result.