Fixed merge conflicts

git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@262 5bc14d19-1e4b-4ba2-aa50-860af135f48c
This commit is contained in:
Juan Miguel Boyero Corral 2012-04-07 14:57:06 +00:00
parent 3a17512d19
commit 7df960dc42

View File

@ -27,7 +27,7 @@ public class Global {
/**
* SWAD application key
*/
private static final String AppKey = "HTC-Desire";
private static final String AppKey = "";
/**
* User logged flag
*/