indented
yes
Merge branch 'master' of https://github.com/flamboyanz/basic-slider

 especially if it merges an updated upstream into a topic branch.
needed