diff options
| author | David Karlaš <david.karlas@xamarin.com> | 2015-03-07 20:06:37 +0300 |
|---|---|---|
| committer | David Karlaš <david.karlas@xamarin.com> | 2015-03-07 20:06:37 +0300 |
| commit | 1648abe589025ecef8818fbdc4e025e95c27dccd (patch) | |
| tree | 2a4087b9ab7816dd17270b26f23d2f99fe35b3e0 /main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors | |
| parent | 3223ac11d202e637e511db7b62a8f0a47e856914 (diff) | |
Fixed some merge errors
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/PropertyTextEditor.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/PropertyTextEditor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/PropertyTextEditor.cs index adef08ca13..841494977e 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/PropertyTextEditor.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/PropertyTextEditor.cs @@ -44,7 +44,7 @@ namespace MonoDevelop.Components.PropertyGrid.PropertyEditors object currentValue; Entry entry; ComboBox combo; - public PropertyTextEditor() + ListStore store; bool changed; public void Initialize (EditSession session) |