diff options
Diffstat (limited to 'main/src/addins/MonoDevelop.GtkCore')
| -rw-r--r-- | main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs index 65dc06e292..ad1b5a8310 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs @@ -272,11 +272,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder return base.OnGetContent (type); } -<<<<<<< d31689b2197378846e127fd9c38d594f7c7f85e1 public override Control Control { -======= - public override Components.Control Control { ->>>>>>> ViewContent now creates Controls instead of GTK widgets get { return content; } |