fix merge conflict
This commit is contained in:
@@ -241,7 +241,6 @@ public partial class RadFlyoutBase : UserControl
|
|||||||
{
|
{
|
||||||
frm.ClientSize = Size;
|
frm.ClientSize = Size;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
frm.Shown += Form_Shown;
|
frm.Shown += Form_Shown;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user