PBG2H23ASA/HAG_BIB_Projekt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mergeconflicts by sourcetree also deleted in xaml

Browse Source
This commit is contained in:
Luis Sander 2025-04-09 10:28:46 +02:00
parent e94dfb54e1
commit ba44f03264
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PrototypWPFHAG/MainWindow.xaml
View File

@ -28,10 +28,6 @@
<PasswordBox Width="170" Height="30" Margin="0,5,34,0" x:Name="PasswordTextBox" <PasswordBox Width="170" Height="30" Margin="0,5,34,0" x:Name="PasswordTextBox"
PasswordChanged="PasswordTextBox_PasswordChanged"/> PasswordChanged="PasswordTextBox_PasswordChanged"/>
<<<<<<< HEAD
<!-- 登录按钮 -->
<Button Height="30" Width="100" Content="Log in" Margin="0,20,0,0" Click="LoginButton_Click" />
=======
<!-- Textbox for visible password (hidden at default) --> <!-- Textbox for visible password (hidden at default) -->
<TextBox Width="170" Height="30" Margin="0,5,34,0" x:Name="PasswordVisibleTextBox" <TextBox Width="170" Height="30" Margin="0,5,34,0" x:Name="PasswordVisibleTextBox"
Visibility="Collapsed" IsReadOnly="True"/> Visibility="Collapsed" IsReadOnly="True"/>
@ -45,7 +41,6 @@
<!-- Login Button --> <!-- Login Button -->
<Button Height="30" Width="100" Content="Zur Suche" Margin="0,20,0,0" <Button Height="30" Width="100" Content="Zur Suche" Margin="0,20,0,0"
Click="loginButton_Click" IsDefault="True" /> Click="loginButton_Click" IsDefault="True" />
>>>>>>> 1195250b98172d34b8c49b85a81c21d1f26cdbac
</StackPanel> </StackPanel>
</Border> </Border>
</Grid> </Grid>