I just try to push my app to heroku that runs fine locally in
development and productin mode. I am getting th app failed to load
error. I have pasted the trace below. I am confused at what the exact
error is. It seems like it may be originating in the enviroment file
however when i look tehre there is no problemd around the line it is
indicating. It almost looks like th git conflict error on gets ??
/usr/local/lib/ruby/site_ruby/1.8/rubygems/custom_require.rb:31:in
`gem_original_require': /disk1/home/slugs/181977_8a89447_8abf/mnt/
config/environment.rb:37: syntax error, unexpected tLSHFT, expecting
kEND (SyntaxError)
<<<<<<< HEAD:config/environment.rb
^
/disk1/home/slugs/181977_8a89447_8abf/mnt/config/environment.rb:38:
syntax error, unexpected tEQQ, expecting kEND
=======
^
/disk1/home/slugs/181977_8a89447_8abf/mnt/config/environment.rb:41:
syntax error, unexpected tRSHFT, expecting kEND
>>>>>>> 18783b1224a1e9dda9a62294cbcca42216201356:config/environment.rb
^
from /usr/local/lib/ruby/site_ruby/1.8/rubygems/custom_require.rb:
31:in `require'
from /usr/local/lib/ruby/gems/1.8/gems/thin-1.0.1/lib/rack/adapter/
rails.rb:31:in `load_application'
from /usr/local/lib/ruby/gems/1.8/gems/thin-1.0.1/lib/rack/adapter/
rails.rb:23:in `initialize'
from /home/heroku_rack/heroku.ru:27:in `new'
from /home/heroku_rack/heroku.ru:27
from /usr/local/lib/ruby/gems/1.8/gems/rack-1.0.1/lib/rack/builder.rb:
29:in `instance_eval'
from /usr/local/lib/ruby/gems/1.8/gems/rack-1.0.1/lib/rack/builder.rb:
29:in `initialize'
from /usr/local/lib/ruby/gems/1.8/gems/rack-1.0.1/lib/rack/builder.rb:
46:in `new'
... 6 levels...
from /usr/local/lib/ruby/gems/1.8/gems/rack-1.0.1/lib/rack/builder.rb:
29:in `instance_eval'
from /usr/local/lib/ruby/gems/1.8/gems/rack-1.0.1/lib/rack/builder.rb:
29:in `initialize'
from /home/heroku_rack/heroku.ru:1:in `new'
from /home/heroku_rack/heroku.ru:1
--
You received this message because you are subscribed to the Google Groups
"Heroku" group.
To post to this group, send email to her...@googlegroups.com.
To unsubscribe from this group, send email to
heroku+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/heroku?hl=en.
