Merge branch 'feature-x'

# Conflicts: # README.md
--- a/README.md
+++ b/README.md
@@ -1 +1,5 @@
 123456
 <<<<<<< HEAD
 123445
 =======
 123479
 >>>>>>> feature-x
--- a/README_BACKUP_1535.md
+++ b/README_BACKUP_1535.md
@@ -0,0 +1,5 @@
 <<<<<<< HEAD
 123445
 =======
 123479
 >>>>>>> feature-x
--- a/README_BASE_1535.md
+++ b/README_BASE_1535.md
@@ -0,0 +1 @@
 123489
--- a/README_LOCAL_1535.md
+++ b/README_LOCAL_1535.md
@@ -0,0 +1 @@
 123445
--- a/README_REMOTE_1535.md
+++ b/README_REMOTE_1535.md
@@ -0,0 +1 @@
 123479
Autor	SHA1	Mensaje	Fecha
2696853015	f19ac66d76	Merge branch 'feature-x' # Conflicts: # README.md	hace 1 mes
2696853015	68f561977f	Merge branch 'feature-x' # Conflicts: # README.md	hace 1 mes
2696853015	4a8b187041	3	hace 1 mes
2696853015	021121b344	2	hace 1 mes
2696853015	7248a14a4b	2	hace 1 mes
2696853015	6687b1b4a7	1	hace 1 mes