conflict

gistfile1.txt

➜  ruby_bookmark_drag git:(jlh_master_url_fixer_method) git pull origin master         
remote: Counting objects: 26, done.
remote: Compressing objects: 100% (22/22), done.
remote: Total 26 (delta 15), reused 15 (delta 4), pack-reused 0
Unpacking objects: 100% (26/26), done.
From github.com:powelljmp/ruby_bookmark_drag
 * branch            master     -> FETCH_HEAD
   0673691..2cec1be  master     -> origin/master
Auto-merging app/views/shared/_form.html.erb
CONFLICT (content): Merge conflict in app/views/shared/_form.html.erb
Auto-merging app/controllers/bookmarks_controller.rb
CONFLICT (content): Merge conflict in app/controllers/bookmarks_controller.rb
Removing app/assets/javascripts/create.js.erb
Automatic merge failed; fix conflicts and then commit the result.