db8a4e1eaf
# Conflicts: # Material.Avalonia/Material.Avalonia.csproj # Material.Colors/Material.Colors.csproj # Material.DataGrid/Material.DataGrid.csproj # Material.Demo/Material.Demo.csproj # Material.Dialog/Material.Dialog.csproj # Material.Dialog/Views/AlertDialog.axaml.cs # Material.Dialog/Views/CustomDialog.axaml.cs # Material.Dialog/Views/TextFieldDialog.axaml.cs # Material.Dialog/Views/TimePickerDialog.axaml.cs # Material.Ripple/Material.Ripple.csproj # Material.Styles/Material.Styles.csproj