fixed a merge request

Jays2Kings · Sep 22, 2016 · 5b87490 · 5b87490
1 parent 547bd7b
commit 5b87490
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs
@@ -1396,16 +1396,8 @@ public Boolean LoadProfile(int device, bool launchprogram, ControlService contro
                 {
                     Item = m_Xdoc.SelectSingleNode("/" + rootname + "/Sensitivity");
                     string[] s = Item.InnerText.Split('|');
-<<<<<<< HEAD
                     if (s.Length == 1)
                         s = Item.InnerText.Split(',');
-=======
-                    if (s.Length != 6)
-                    {
-                        s = Item.InnerText.Split(',');
-                    }
-
->>>>>>> origin/jay
                     double.TryParse(s[0], out LSSens[device]);
                     double.TryParse(s[1], out RSSens[device]);
                     double.TryParse(s[2], out l2Sens[device]);