From 7e4fc5fe96edb431407256a3945a925095f7c9a0 Mon Sep 17 00:00:00 2001
From: kleper <kleper@kleper.net>
Date: Thu, 24 Nov 2016 15:17:49 -0500
Subject: [PATCH 1/2] Update 'milfs/includes/datos.php'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Se le agrega p:localhost en la configuración del servidor para asegurar la persistencia de las conexiones a la base de datos. Es una solucion para el entorno de desarrollo.
---
 milfs/includes/datos.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/milfs/includes/datos.php b/milfs/includes/datos.php
index 3d11567..c947de5 100755
--- a/milfs/includes/datos.php
+++ b/milfs/includes/datos.php
@@ -1,7 +1,7 @@
 <?php
 $usuario="root";
 $password="toor";//
-$servidor="localhost";
+$servidor="p:localhost";
 $db="tupale";
 $path_instalacion ="/var/www/html/default/tupale/milfs";
 $path_images_secure ="/home/images_secure";

From 18b2c901bab875e15c573000eda8732b5fb62ac5 Mon Sep 17 00:00:00 2001
From: kleper <kleper@kleper.net>
Date: Thu, 24 Nov 2016 20:59:20 -0500
Subject: [PATCH 2/2] Comentario de prueba para los branch y merges

---
 index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/index.php b/index.php
index 970740e..996caa7 100755
--- a/index.php
+++ b/index.php
@@ -962,5 +962,6 @@ $(document).ready(function() {
 </script>
 <noscript><p><img src="//stats.tupale.co/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
 <!-- End Piwik Code -->
+<!-- COMENTARIO PARA BORRAR -->
 </body>
 </html>