Fixed merge error

ritthisakdi · Oct 8, 2015 · 08ded6f · 08ded6f
1 parent f03fb4d
commit 08ded6f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/public/mbw/src/main/java/com/mycelium/wallet/Utils.java b/public/mbw/src/main/java/com/mycelium/wallet/Utils.java
@@ -263,7 +263,7 @@ public static void showSimpleMessageDialog(final Context context, String message
     * Show a dialog with a buttons that displays a message. Click the message
     * or the back button to make it disappear.
     */
-   public static void showSimpleMessageDialog(final Context context, String message, final Runnable okayRunner, @StringRes int okayButtonText, final Runnable postRunner) {
+   public static void showSimpleMessageDialog(final Context context, String message, final Runnable okayRunner, int okayButtonText, final Runnable postRunner) {
       LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
       final View layout = inflater.inflate(R.layout.simple_message_dialog, null);
       AlertDialog.Builder builder = new AlertDialog.Builder(context).setView(layout);
@@ -295,7 +295,6 @@ public void onDismiss(DialogInterface dialog) {
       dialog.show();
    }
 
-
    /**
     * Show an optional message/
     * <p/>

diff --git a/public/mbw/src/main/java/com/mycelium/wallet/activity/main/TransactionHistoryFragment.java b/public/mbw/src/main/java/com/mycelium/wallet/activity/main/TransactionHistoryFragment.java
@@ -60,7 +60,6 @@
 import com.mycelium.wallet.activity.modern.Toaster;
 import com.mycelium.wallet.activity.send.BroadcastTransactionActivity;
 import com.mycelium.wallet.activity.util.EnterAddressLabelUtil;
-import com.mycelium.wallet.activity.util.AdaptiveDateFormat;
 import com.mycelium.wallet.activity.util.TransactionConfirmationsDisplay;
 import com.mycelium.wallet.event.AddressBookChanged;
 import com.mycelium.wallet.event.ExchangeRatesRefreshed;