From 5cf5503c91e3fb5e3caddf5ec3bb1a4e3069d7ae Mon Sep 17 00:00:00 2001
From: Lars Brubaker <larsbrubaker@gmail.com>
Date: Thu, 12 Apr 2018 17:45:50 -0700
Subject: [PATCH] merge fail fix

---
 DesignTools/PublicPropertyEditor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DesignTools/PublicPropertyEditor.cs b/DesignTools/PublicPropertyEditor.cs
index 04ed0895c..2ad21d348 100644
--- a/DesignTools/PublicPropertyEditor.cs
+++ b/DesignTools/PublicPropertyEditor.cs
@@ -455,7 +455,7 @@ namespace MatterHackers.MatterControl.DesignTools
 			{
 				rowContainer = CreateSettingsRow(property.DisplayName.Localize(), property.Description.Localize());
 
-				var field = new ToggleboxField(theme.Colors.PrimaryTextColor);
+				var field = new ToggleboxField(theme);
 				field.Initialize(0);
 				field.Checked = boolValue;
 				field.ValueChanged += (s, e) =>