From 18dfe49596999bcc3ad4be245e8a186c32498b83 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Thu, 13 Oct 2011 16:54:58 +0000
Subject: [PATCH] Weitere Korrekturen an PublicPersonalProfile

git-svn-id: https://svn.libreccm.org/ccm/trunk@1167 8810af33-2d31-482b-a856-94f89814c4df
---
 .../cms/contenttypes/PublicPersonalProfileXmlUtil.java   | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java
index e88e126f4..d84d95d2f 100644
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java
@@ -85,13 +85,8 @@ public class PublicPersonalProfileXmlUtil {
                 navHome.addAttribute("isSelected", "false");
             }
             navHome.addAttribute("sortKey", "");
-<<<<<<< .mine
-            String homeLabel = homeLabels.get(DispatcherHelper.getNegotiatedLocale().
-=======
-            String homeLabel = homeLabels.get(GlobalizationHelper.
-                    getNegotiatedLocale().
->>>>>>> .r1165
-                    getLanguage());
+
+            String homeLabel = homeLabels.get(GlobalizationHelper.getNegotiatedLocale().getLanguage());
             if (homeLabel == null) {
                 navHome.addAttribute("title", "Home");
             } else {