Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs: left is a valid mode in contents.openDevTools() options #32372

Merged
merged 1 commit into from Jan 10, 2022

docs: left is a valid mode in contents.openDevTools() options

992f30b
Select commit
Failed to load commit list.
Merged

docs: left is a valid mode in contents.openDevTools() options #32372

docs: left is a valid mode in contents.openDevTools() options
992f30b
Select commit
Failed to load commit list.
trop / Backportable? - 13-x-y completed Jan 7, 2022 in 1d 0h 4m 11s

Backport Failed

This PR was checked and could not be automatically backported to "13-x-y" cleanly

Details

Failed Diff:

diff --cc docs/api/web-contents.md
index bbf41cadb,0ee3e965d..000000000
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@@ -1645,10 -1610,10 +1645,15 @@@ app.whenReady().then(() => 
  #### `contents.openDevTools([options])`
  
  * `options` Object (optional)
++<<<<<<< HEAD
 +  * `mode` String - Opens the devtools with specified dock state, can be
 +    `right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
++=======
+   * `mode` string - Opens the devtools with specified dock state, can be
+     `left`, `right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
++>>>>>>> docs: left is a valid mode in contents.openDevTools() options
      In `undocked` mode it's possible to dock back. In `detach` mode it's not.
 -  * `activate` boolean (optional) - Whether to bring the opened devtools window
 +  * `activate` Boolean (optional) - Whether to bring the opened devtools window
      to the foreground. The default is `true`.
  
  Opens the devtools.

Annotations

Check failure on line 1649 in docs/api/web-contents.md

See this annotation in the file changed.

@trop trop / Backportable? - 13-x-y

docs/api/web-contents.md#L1648-L1649

Patch Conflict
Raw output
++<<<<<<< HEAD
 +  * `mode` String - Opens the devtools with specified dock state, can be
 +    `right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
++=======
+   * `mode` string - Opens the devtools with specified dock state, can be
+     `left`, `right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
++>>>>>>> docs: left is a valid mode in contents.openDevTools() options

Check failure on line 1649 in docs/api/web-contents.md

See this annotation in the file changed.

@trop trop / Backportable? - 13-x-y

docs/api/web-contents.md#L1648-L1649

Patch Conflict
Raw output
++<<<<<<< HEAD
 +  * `mode` String - Opens the devtools with specified dock state, can be
 +    `right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
++=======
+   * `mode` string - Opens the devtools with specified dock state, can be
+     `left`, `right`, `bottom`, `undocked`, `detach`. Defaults to last used dock state.
++>>>>>>> docs: left is a valid mode in contents.openDevTools() options