Клон проекта рельсов из github не может работать

Question

• 1000

Answer 1

 I comment out below code at /config/environments/development.rb
then i can run it
# <<<<<<< HEAD
# config.assets.unknown_asset_fallback = true
# config.assets.check_precompiled_asset = false
# >>>>>>> forgot
## Highlight code that triggered database queries in logs.

 thanks