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:
parent
b928a5e499
commit
31ef3ced82
|
@ -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
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue
Block a user