rebase

Author: fouratachour

test/itg/1.6/common.webdriverio.js

@@ -118,20 +118,13 @@ module.exports = {
                 client = webdriverio
                     .remote(options2)
                     .init()
-<<<<<<< HEAD
                 .windowHandleSize({width: 1280, height: 1024});
-=======
-                    .windowHandleMaximize()
->>>>>>> 4b61d13...  Adding  .windowHandleMaximize()
             } else {
                 client = webdriverio
                     .remote(options)
                     .init()
-<<<<<<< HEAD
                 .windowHandleSize({width: 1280, height: 1024});
-=======
-                    .windowHandleMaximize()
->>>>>>> 4b61d13...  Adding  .windowHandleMaximize()
+
             }
             initCommands(client);
 

test/itg/1.7/common.webdriverio.js

@@ -98,20 +98,12 @@ module.exports = {
                 client = webdriverio
                     .remote(options2)
                     .init()
-<<<<<<< HEAD
                 .windowHandleSize({width: 1280, height: 1024});
-=======
-                    .windowHandleMaximize()
->>>>>>> 4b61d13...  Adding  .windowHandleMaximize()
             } else {
                 client = webdriverio
                     .remote(options)
                     .init()
-<<<<<<< HEAD
                 .windowHandleSize({width: 1280, height: 1024});
-=======
-                    .windowHandleMaximize()
->>>>>>> 4b61d13...  Adding  .windowHandleMaximize()
             }
             initCommands(client);