From 81c8fdf7a5d04731c6bb6820f28ec591fbe868fb Mon Sep 17 00:00:00 2001
From: kiranniranjan <kiran@kike.co.in>
Date: Thu, 18 Jan 2018 16:40:07 +0530
Subject: [PATCH] Electron-249 Resolved conflicts

---
 js/mainApiMgr.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/mainApiMgr.js b/js/mainApiMgr.js
index 9d67dd41..bd7c85d1 100644
--- a/js/mainApiMgr.js
+++ b/js/mainApiMgr.js
@@ -106,7 +106,7 @@ electron.ipcMain.on(apiName, (event, arg) => {
                 // validates the user bring to front config and activates the wrapper
                 if (typeof arg.reason === 'string' && arg.reason === 'bringToFront') {
                     bringToFront(arg.windowName);
-                    return;
+                    break;
                 }
                 windowMgr.activate(arg.windowName);
             }