aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/org/bienvenidoainternet
diff options
context:
space:
mode:
authorLibravatar Renard 2016-04-13 20:11:31 -0300
committerLibravatar Renard 2016-04-13 20:11:31 -0300
commit9ccfef2d01c3526e875fce7303c3ab3b4b8a144d (patch)
tree9d7d881d70719626d5813f880fa671eb996799ed /app/src/main/java/org/bienvenidoainternet
parent0e2e9c36ae3f90e2a825b64b72f2a990440b347f (diff)
downloadBaiApp-9ccfef2d01c3526e875fce7303c3ab3b4b8a144d.tar.gz
BaiApp-9ccfef2d01c3526e875fce7303c3ab3b4b8a144d.tar.xz
BaiApp-9ccfef2d01c3526e875fce7303c3ab3b4b8a144d.zip
Test
Diffstat (limited to 'app/src/main/java/org/bienvenidoainternet')
-rw-r--r--app/src/main/java/org/bienvenidoainternet/baiparser/MainActivity.java2
1 files changed, 2 insertions, 0 deletions
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);