From 493ec6ebd603ebba91f69051c7ae40deb7866215 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Fri, 13 Jul 2018 15:39:29 +0200 Subject: [PATCH] Update conflicts Signed-off-by: Mario Danic --- .../talk/controllers/bottomsheet/CallMenuController.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java index d69695690..e461e30d8 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java @@ -125,18 +125,9 @@ public class CallMenuController extends BaseController implements FlexibleAdapte if (menuType.equals(MenuType.REGULAR)) { if (!TextUtils.isEmpty(room.getDisplayName())) { -<<<<<<< Updated upstream - menuItems.add(new MenuItem( - getResources().getString( - R.string.nc_configure_named_room, room.getDisplayName()), 0, null)); - } else if (!TextUtils.isEmpty(room.getName())) { - menuItems.add(new MenuItem(getResources().getString( - R.string.nc_configure_named_room, room.getName()), 0, null)); -======= menuItems.add(new MenuItem(room.getDisplayName(), 0, null)); } else if (!TextUtils.isEmpty(room.getName())) { menuItems.add(new MenuItem(room.getName(), 0, null)); ->>>>>>> Stashed changes } else { menuItems.add(new MenuItem(getResources().getString(R.string.nc_configure_room), 0, null)); }