fix conflicts

Author: lmiller1990

packages/runner-shared/src/logger.js

@@ -30,12 +30,10 @@ export const logger = {
     _.each(formattedLog, (value, key) => {
       // don't log empty strings
       // _.trim([]) returns '' but we want to log empty arrays, so account for that
-<<<<<<< HEAD
       if (_.isString(value) && _.trim(value) === '') return
-=======
+
       // Skip trim if we know value is an object
       if (typeof value !== 'object' && _.trim(value) === '' && !_.isArray(value)) return
->>>>>>> develop
 
       this.log(`%c${key}`, 'font-weight: bold', value)
     })

packages/types/src/server.ts

@@ -36,6 +36,7 @@ export interface LaunchArgs {
   testingType: Cypress.TestingType
   invokedFromCli: boolean
   os: PlatformName
+  exit?: boolean
 
   onFocusTests?: () => any
 }