From 9ccfef2d01c3526e875fce7303c3ab3b4b8a144d Mon Sep 17 00:00:00 2001
From: Renard
Date: Wed, 13 Apr 2016 20:11:31 -0300
Subject: Test

---
 app/src/main/java/org/bienvenidoainternet/baiparser/MainActivity.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app')

diff --git a/app/src/main/java/org/bienvenidoainternet/baiparser/MainActivity.java b/app/src/main/java/org/bienvenidoainternet/baiparser/MainActivity.java
index d42f9d7..b675315 100644
--- a/app/src/main/java/org/bienvenidoainternet/baiparser/MainActivity.java
+++ b/app/src/main/java/org/bienvenidoainternet/baiparser/MainActivity.java
@@ -194,6 +194,8 @@ public class MainActivity extends AppCompatActivity
         }
     }
 
+    //merge test hola, no se ocupar git ww
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-- 
cgit v1.2.1-18-gbd029