fix ci

oliviertassinari · oliviertassinari · commit 4f3dd3dd25f5 · 2020-11-24T10:50:49.000+01:00
diff --git a/docs/pages/api-docs/icon-button.md b/docs/pages/api-docs/icon-button.md
@@ -72,5 +72,4 @@ You can take advantage of this behavior to [target nested components](/guides/ap
 ## Demos
 
 - [Buttons](/components/buttons/)
-- [Grid List](/components/grid-list/)
 
diff --git a/docs/pages/api-docs/list-subheader.md b/docs/pages/api-docs/list-subheader.md
@@ -61,6 +61,5 @@ If that's not sufficient, you can check the [implementation of the component](ht
 
 ## Demos
 
-- [Grid List](/components/grid-list/)
 - [Lists](/components/lists/)
 
diff --git a/docs/src/pages/components/grid-list/grid-list-de.md b/docs/src/pages/components/grid-list/grid-list-de.md
@@ -31,8 +31,4 @@ Dieses Beispiel zeigt eine horizontale, durchlaufbare, einzeilige Rasterliste vo
 
 In diesem Beispiel werden "vorgestellte" Fliesen dargestellt, wobei die Eigenschaften `rows` und `cols` die Größe der Kacheln festlegen und der Abstand durch die `padding` Eigenschaft einstellen wird. Die Kacheln haben eine angepasste Titleleiste, an der Spitze positioniert ist und einem benutzerdefinierten Gradienten `titleBackground` hat. Die sekundäre Aktion `IconButton` befindet sich links.
 
-<<<<<<< HEAD:docs/src/pages/components/image-list/image-list-de.md
-{{"demo": "pages/components/image-list/AdvancedImageList.js", "hideEditButton": true, "defaultCodeOpen": false}}
-=======
 {{"demo": "pages/components/grid-list/AdvancedGridList.js", "hideEditButton": true, "defaultCodeOpen": false}}
->>>>>>> parent of a2c1b56e22... [GridList] Rename to ImageList & add deprecation warnings (#22363):docs/src/pages/components/grid-list/grid-list-de.md
diff --git a/docs/src/pages/components/grid-list/grid-list-es.md b/docs/src/pages/components/grid-list/grid-list-es.md
@@ -31,8 +31,4 @@ Este ejemplo muestra una lista cuadrícula con una sola línea desplazable horiz
 
 Este ejemplo muestra cuadros "destacados" usando los props filas (`rows`) y columnas (`cols`) para ajustar el tamaño del cuadro, y la prop relleno (`padding`) para ajustar el espaciado. Los cuadros tienen una barra de título personalizada, ubicada en la parte superior y un fondo de titulo (`titleBackground`) con degradado personalizado. La acción secundaria `IconButton` está ubicada a la izquierda.
 
-<<<<<<< HEAD:docs/src/pages/components/image-list/image-list-es.md
-{{"demo": "pages/components/image-list/AdvancedImageList.js", "hideEditButton": true, "defaultCodeOpen": false}}
-=======
 {{"demo": "pages/components/grid-list/AdvancedGridList.js", "hideEditButton": true, "defaultCodeOpen": false}}
->>>>>>> parent of a2c1b56e22... [GridList] Rename to ImageList & add deprecation warnings (#22363):docs/src/pages/components/grid-list/grid-list-es.md
diff --git a/docs/src/pages/components/grid-list/grid-list-fr.md b/docs/src/pages/components/grid-list/grid-list-fr.md
@@ -1,6 +1,6 @@
 ---
 title: Composant React Grid List
-components: GridList, GridListTile, GridListTileBar, ListSubheader, IconButton
+components: GridList, GridListTile, GridListTileBar
 ---
 
 # Grid list
diff --git a/docs/src/pages/components/grid-list/grid-list-ja.md b/docs/src/pages/components/grid-list/grid-list-ja.md
@@ -31,8 +31,4 @@ components: GridList, GridListTile, GridListTileBar
 
 この例では、`rows` and `cols` プロップを使用してタイルのサイズを調整し、 `padding`プロップを使用して間隔を調整する方法を示します。 タイルには、上部にカスタムのタイトルバーがあり、カスタムのグラデーション`titleBackground`があります。 セカンダリアクション `IconButton` は左側に配置されます。
 
-<<<<<<< HEAD:docs/src/pages/components/image-list/image-list-ja.md
-{{"demo": "pages/components/image-list/AdvancedImageList.js", "hideEditButton": true, "defaultCodeOpen": false}}
-=======
 {{"demo": "pages/components/grid-list/AdvancedGridList.js", "hideEditButton": true, "defaultCodeOpen": false}}
->>>>>>> parent of a2c1b56e22... [GridList] Rename to ImageList & add deprecation warnings (#22363):docs/src/pages/components/grid-list/grid-list-ja.md
diff --git a/docs/src/pages/components/grid-list/grid-list-pt.md b/docs/src/pages/components/grid-list/grid-list-pt.md
@@ -31,8 +31,4 @@ Este exemplo demonstra uma lista de grade com imagens, em linha unica e rolável
 
 Este exemplo demonstra blocos "em destaque", usando as propriedades `rows` e `cols` para ajustar o tamanho do bloco, e a propriedade `padding` para ajustar o espaçamento. Os blocos tem uma barra de título customizada, posicionada no topo e com um gradiente personalizado `titleBackground`. A ação secundária `IconButton` está posicionada à esquerda.
 
-<<<<<<< HEAD:docs/src/pages/components/image-list/image-list-pt.md
-{{"demo": "pages/components/image-list/AdvancedImageList.js", "hideEditButton": true, "defaultCodeOpen": false}}
-=======
 {{"demo": "pages/components/grid-list/AdvancedGridList.js", "hideEditButton": true, "defaultCodeOpen": false}}
->>>>>>> parent of a2c1b56e22... [GridList] Rename to ImageList & add deprecation warnings (#22363):docs/src/pages/components/grid-list/grid-list-pt.md
diff --git a/docs/src/pages/components/grid-list/grid-list-ru.md b/docs/src/pages/components/grid-list/grid-list-ru.md
@@ -31,8 +31,4 @@ components: GridList, GridListTile, GridListTileBar
 
 В этом примере демонстрирует «рекомендуемые» листы, в которых используются свойства `rows` и `cols` чтобы отрегулировать размер плитки, и свойство `padding` чтобы отрегулировать поля между плитками. На плитках можно видеть пользовательскую полосу расположенную вверху с даным значением градиента в свойстве `titleBackground`. Дополнительное действие в `Кнопке-иконке` распложенно по левую сторону.
 
-<<<<<<< HEAD:docs/src/pages/components/image-list/image-list-ru.md
-{{"demo": "pages/components/image-list/AdvancedImageList.js", "hideEditButton": true, "defaultCodeOpen": false}}
-=======
 {{"demo": "pages/components/grid-list/AdvancedGridList.js", "hideEditButton": true, "defaultCodeOpen": false}}
->>>>>>> parent of a2c1b56e22... [GridList] Rename to ImageList & add deprecation warnings (#22363):docs/src/pages/components/grid-list/grid-list-ru.md
diff --git a/docs/src/pages/components/grid-list/grid-list-zh.md b/docs/src/pages/components/grid-list/grid-list-zh.md
@@ -1,5 +1,4 @@
 ---
-<<<<<<< HEAD:docs/src/pages/components/image-list/image-list-zh.md
 title: React Image list（图像列表）组件
 components: GridList, GridListTile, GridListTileBar
 ---
diff --git a/docs/src/pages/components/grid-list/grid-list.md b/docs/src/pages/components/grid-list/grid-list.md
@@ -1,6 +1,6 @@
 ---
 title: Grid List React component
-components: GridList, GridListTile, GridListTileBar, ListSubheader, IconButton
+components: GridList, GridListTile, GridListTileBar
 ---
 
 # Grid List

Original file line number	Diff line number	Diff line change
`@@ -72,5 +72,4 @@ You can take advantage of this behavior to [target nested components](/guides/ap`
`72`	`72`	`## Demos`
`73`	`73`
`74`	`74`	`- [Buttons](/components/buttons/)`
`75`		`-- [Grid List](/components/grid-list/)`
`76`	`75`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,5 @@ If that's not sufficient, you can check the [implementation of the component](ht`
`61`	`61`
`62`	`62`	`## Demos`
`63`	`63`
`64`		`-- [Grid List](/components/grid-list/)`
`65`	`64`	`- [Lists](/components/lists/)`
`66`	`65`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`---`
`2`		`-<<<<<<< HEAD:docs/src/pages/components/image-list/image-list-zh.md`
`3`	`2`	`title: React Image list（图像列表）组件`
`4`	`3`	`components: GridList, GridListTile, GridListTileBar`
`5`	`4`	`---`