Skip to content

Commit

Permalink
Fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
dudantas committed Feb 2, 2023
1 parent 56f7912 commit 5494335
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
Foreground="#909090">Genesis</TextBlock>
<Grid
Grid.Row="1"
Margin="20, 0, 0, 0">
Margin="10, 3, 10, 3">

<Grid.ColumnDefinitions>
<ColumnDefinition Width="65"/>
Expand All @@ -237,7 +237,7 @@
<TextBlock
Grid.Column="1"
x:Name="hintsBox"
Margin="10, 0, 0, 0"
Margin="5, 0, 0, 0"
Foreground="#bfbfbf"
FontFamily="Verdana"
FontSize="12">A new goddess stepped out of the void like a new-born mermaid from<LineBreak/> her shell.
Expand Down

0 comments on commit 5494335

Please sign in to comment.