Create doc2-rama1.txt
crear doc-rama1
Update doc-rama1.txt
cambio doc-rama1.txt
Merge remote-tracking branch 'origin/rama1' into rama1

Conflicts:
	doc-rama1.txt
Update doc-rama1.txt
otro cambio
Revert "otro cambio"

This reverts commit 43d441b051183eae1642f6c2c310d85ec24036d7.
Revert "Revert "otro cambio""

This reverts commit 6534bf71d1cedb4debf5cc853700292beb35bc9b.
Merge remote-tracking branch 'origin/rama1' into rama1

Conflicts:
	doc-rama1.txt
Merge pull request #1 from josejulioc4b/rama1

Create doc2-rama1.txt