From 549845fd40cc4d3ab7ea99a16c6e148e795fa4e9 Mon Sep 17 00:00:00 2001 From: l3d00m Date: Mon, 24 Aug 2015 15:05:36 +0200 Subject: [PATCH] Fixed "bug" caused through rebasing :( --- .../com/moez/QKSMS/ui/delivery/DeliveryReportHelper.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/delivery/DeliveryReportHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/delivery/DeliveryReportHelper.java index 0eee0498..7bbab4e1 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/delivery/DeliveryReportHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/delivery/DeliveryReportHelper.java @@ -232,12 +232,7 @@ public class DeliveryReportHelper { } try { -<<<<<<< HEAD Map statusMap = new HashMap<>(); -======= - Map statusMap = - new HashMap<>(); ->>>>>>> origin/develop while (c.moveToNext()) { String recipient = c.getString(COLUMN_RECIPIENT);