Fixed merge conflicts

This commit is contained in:
Juan Miguel Boyero Corral 2012-04-07 16:38:12 +02:00
parent eb1d5d5c99
commit b124251ab9

View File

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