fix bad merge

This commit is contained in:
William Saulnier 2018-06-08 17:36:33 -07:00
parent dfe6257211
commit 127ce8b044

View file

@ -1466,6 +1466,7 @@ private void InitializeComponent()
//
this.eiCustomUploaders.CustomFilter = "ShareX custom uploader (*.sxcu)|*.sxcu";
this.eiCustomUploaders.DefaultFileName = null;
this.eiCustomUploaders.ExportIgnoreDefaultValue = true;
this.eiCustomUploaders.ExportIgnoreNull = true;
resources.ApplyResources(this.eiCustomUploaders, "eiCustomUploaders");
this.eiCustomUploaders.Name = "eiCustomUploaders";