Line delete
Conflict with config/secrets.yml

Terminal:
macbook-pro-rl:myapp radoslawlukasiewicz$ git pull shelly master
From git.shellycloud.com:first-cloud
 * branch            master     -> FETCH_HEAD
error: refusing to lose untracked file at 'config/secrets.yml'
CONFLICT (modify/delete): config/secrets.yml deleted in HEAD and
modified in 847d7ed017161649145ec64db727cf3e390f1e9e. Version
847d7ed017161649145ec64db727cf3e390f1e9e of config/secrets.yml left in
tree.
Automatic merge failed; fix conflicts and then commit the result.