ya funciona montannias en x
commit de datos en confliccto
commit
hotfix
todo bien

h 'development'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
lol_.html is the real lol
copy of development to master

ge branch 'master' into development

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.