fixed merge conflicts

elastic · Aug 10, 2021 · 3531091 · 3531091
2 parents 8028b1f + 565e071
commit 3531091
Show file tree

Hide file tree

Showing 916 changed files with 17,819 additions and 12,529 deletions.
diff --git a/STYLEGUIDE.mdx b/STYLEGUIDE.mdx
@@ -35,7 +35,7 @@ remove it, don't simply comment it out.
 
 We are gradually moving the Kibana code base over to Prettier. All TypeScript code
 and some JavaScript code (check `.eslintrc.js`) is using Prettier to format code. You
-can run `node script/eslint --fix` to fix linting issues and apply Prettier formatting.
+can run `node scripts/eslint --fix` to fix linting issues and apply Prettier formatting.
 We recommend you to enable running ESLint via your IDE.
 
 Whenever possible we are trying to use Prettier and linting over written style guide rules.

diff --git a/api_docs/charts.json b/api_docs/charts.json
@@ -2539,7 +2539,7 @@
             "text": "Adapters"
           },
           ", ",
-          "SerializableState",
+          "Serializable",
           ">>"
         ],
         "path": "src/plugins/charts/common/palette.ts",
@@ -2597,7 +2597,7 @@
             "text": "Adapters"
           },
           ", ",
-          "SerializableState",
+          "Serializable",
           ">>"
         ],
         "path": "src/plugins/charts/common/palette.ts",

diff --git a/api_docs/dashboard.json b/api_docs/dashboard.json
@@ -1137,8 +1137,8 @@
             "pluginId": "kibanaUtils",
             "scope": "common",
             "docId": "kibKibanaUtilsPluginApi",
-            "section": "def-common.SerializableState",
-            "text": "SerializableState"
+            "section": "def-common.Serializable",
+            "text": "Serializable"
           }
         ],
         "path": "src/plugins/dashboard/public/locator.ts",
@@ -1204,8 +1204,8 @@
                 "pluginId": "kibanaUtils",
                 "scope": "common",
                 "docId": "kibKibanaUtilsPluginApi",
-                "section": "def-common.SerializableState",
-                "text": "SerializableState"
+                "section": "def-common.Serializable",
+                "text": "Serializable"
               },
               ") | undefined"
             ],
@@ -1334,8 +1334,8 @@
                 "pluginId": "kibanaUtils",
                 "scope": "common",
                 "docId": "kibKibanaUtilsPluginApi",
-                "section": "def-common.SerializableState",
-                "text": "SerializableState"
+                "section": "def-common.Serializable",
+                "text": "Serializable"
               },
               ") | undefined"
             ],