From 6f600a80b8bf09068a9e98ece248bd007c29ab88 Mon Sep 17 00:00:00 2001 From: agrajaghh Date: Wed, 25 Mar 2015 20:02:07 +0100 Subject: [PATCH] fix merge conflict between #2743 and #2746 Closes #2789 //FREEBIE --- src/org/thoughtcrime/securesms/RegistrationActivity.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/org/thoughtcrime/securesms/RegistrationActivity.java b/src/org/thoughtcrime/securesms/RegistrationActivity.java index 950b86fa44..a99597f619 100644 --- a/src/org/thoughtcrime/securesms/RegistrationActivity.java +++ b/src/org/thoughtcrime/securesms/RegistrationActivity.java @@ -197,8 +197,7 @@ public class RegistrationActivity extends BaseActionBarActivity { AlertDialogWrapper.Builder dialog = new AlertDialogWrapper.Builder(self); dialog.setTitle(PhoneNumberFormatter.getInternationalFormatFromE164(e164number)); - dialog.setMessage(String.format(getString(R.string.RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s), - PhoneNumberFormatter.getInternationalFormatFromE164(e164number))); + dialog.setMessage(R.string.RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s); dialog.setPositiveButton(getString(R.string.RegistrationActivity_continue), new DialogInterface.OnClickListener() { @Override