diff options
author | Lluis Sanchez <lluis@xamarin.com> | 2015-11-25 17:41:21 +0300 |
---|---|---|
committer | Lluis Sanchez <lluis@xamarin.com> | 2015-11-25 18:44:59 +0300 |
commit | 30e7d9486dfe4058b6fdf1dbb2ed0f59128ac174 (patch) | |
tree | d414eb36b89f7fd929cd0fe43539097340191776 /main/src/addins | |
parent | 2b5ab0407e7c14f95c326375388f388780b8e9af (diff) |
Fix incorrect merges
Diffstat (limited to 'main/src/addins')
-rw-r--r-- | main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs | 4 | ||||
-rw-r--r-- | main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/Commands.cs | 5 |
2 files changed, 0 insertions, 9 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; } diff --git a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/Commands.cs b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/Commands.cs index f68d14aef3..93ede5928a 100644 --- a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/Commands.cs +++ b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/Commands.cs @@ -68,13 +68,8 @@ namespace MonoDevelop.RegexToolkit class DefaultAttachableViewContent : BaseViewContent { Widget widget; -<<<<<<< d31689b2197378846e127fd9c38d594f7c7f85e1 public override Control Control { -======= - - public override Components.Control Control { ->>>>>>> ViewContent now creates Controls instead of GTK widgets get { return widget; } |