From 7df960dc42c20b58984c417881bc8fb488638c04 Mon Sep 17 00:00:00 2001 From: Juan Miguel Boyero Corral Date: Sat, 7 Apr 2012 14:57:06 +0000 Subject: [PATCH] Fixed merge conflicts git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@262 5bc14d19-1e4b-4ba2-aa50-860af135f48c --- SWADroid/src/es/ugr/swad/swadroid/Global.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SWADroid/src/es/ugr/swad/swadroid/Global.java b/SWADroid/src/es/ugr/swad/swadroid/Global.java index c48874a2..c1fc01a5 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/Global.java +++ b/SWADroid/src/es/ugr/swad/swadroid/Global.java @@ -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 */