Resolve merge conflict
This commit is contained in:
commit
99bc2a83a3
|
@ -26,7 +26,8 @@ namespace W4Gui.Dialogs
|
|||
{
|
||||
if (!saved)
|
||||
{
|
||||
if(MessageBox.Show("Are you sure you want to exit?\nyou'll lose any changes you've made to the weapon.", "Are you sure?", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
|
||||
|
||||
if (MessageBox.Show("Are you sure you want to exit?\nyou'll lose any changes you've made to the weapon.", "Are you sure?", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
|
||||
{
|
||||
this.saved = true;
|
||||
this.DialogResult = DialogResult.Cancel;
|
||||
|
|
Loading…
Reference in New Issue