Skip to content

Commit f793857

Browse files
committed
Resolve merge comflict
1 parent 2dc54fb commit f793857

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/AzureOpenAIProxy.PlaygroundApp/Components/Pages/Playground.razor

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
<FluentHeader Style="padding-top: 5px;"><h1>Azure OpenAI Proxy Playground</h1></FluentHeader>
88

99
<FluentGrid Spacing="0" AdaptiveRendering="true" Justify="JustifyContent.FlexStart">
10-
<FluentGridItem Class="config-grid" xs="12" sm="12" md="4" lg="4" xl="4" xxl="4">
10+
<FluentGridItem Class="config-grid" xs="12" sm="12" md="4" lg="4" xl="4" xxl="4" Style="border:1px solid lightgrey">
1111
<ConfigWindowComponent Id="config-window" OnSystemMessageChanged="SetSystemMessage" @rendermode="InteractiveServer" />
1212
</FluentGridItem>
1313

14-
<FluentGridItem Class="chat-grid" xs="12" sm="12" md="8" lg="8" xl="8" xxl="8"
15-
Style="border:1px solid lightgrey">
14+
<FluentGridItem Class="chat-grid" xs="12" sm="12" md="8" lg="8" xl="8" xxl="8" Style="border:1px solid lightgrey">
1615
<ChatWindowComponent Id="chat-window" @rendermode="InteractiveServer" />
1716
</FluentGridItem>
1817
</FluentGrid>

0 commit comments

Comments
 (0)