Fixed merge conflicts with PR-623

This commit is contained in:
Harshan Liyanage 2017-03-14 14:59:03 +05:30
parent e686b2af0e
commit 1cbdb84cf1

View File

@ -39,9 +39,6 @@ public class FCMPushNotificationServiceComponent {
@SuppressWarnings("unused") @SuppressWarnings("unused")
protected void activate(ComponentContext componentContext) { protected void activate(ComponentContext componentContext) {
try { try {
if (log.isDebugEnabled()) {
log.debug("Initializing FCM based push notification provider implementation bundle");
}
//Do nothing //Do nothing
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("FCM based push notification provider implementation bundle has been successfully " + log.debug("FCM based push notification provider implementation bundle has been successfully " +