Э
https://api.rubyonrails.org/classes/ActionMailer/MessageDelivery.html#method-i-deliver_later
Size: a a a
Э
M
D
OE
OE
OE
M
RG
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'git@github.com:simple/simple-photo-blog.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again.
Gemfile
и в версии рельсов:<<<<<<< HEAD
=======
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.2'
>>>>>>> 75528960ac31e32a6269fc29b8ce017f631d973d
* branch master -> FETCH_HEAD
Auto-merging Gemfile
CONFLICT (content): Merge conflict in Gemfile
Automatic merge failed; fix conflicts and then commit the result
RG