From 1cbdb84cf18939d5cae841a5d5a1c6e4a2483be0 Mon Sep 17 00:00:00 2001
From: Harshan Liyanage <harshan@wso2.com>
Date: Tue, 14 Mar 2017 14:59:03 +0530
Subject: [PATCH] Fixed merge conflicts with PR-623

---
 .../fcm/internal/FCMPushNotificationServiceComponent.java      | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/internal/FCMPushNotificationServiceComponent.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/internal/FCMPushNotificationServiceComponent.java
index 3aa753c96e..8993e6928a 100644
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/internal/FCMPushNotificationServiceComponent.java
+++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/internal/FCMPushNotificationServiceComponent.java
@@ -39,9 +39,6 @@ public class FCMPushNotificationServiceComponent {
     @SuppressWarnings("unused")
     protected void activate(ComponentContext componentContext) {
         try {
-            if (log.isDebugEnabled()) {
-                log.debug("Initializing FCM based push notification provider implementation bundle");
-            }
             //Do nothing
             if (log.isDebugEnabled()) {
                 log.debug("FCM based push notification provider implementation bundle has been successfully " +