From 5b874906446ef216a8b8cb2d1c8eb9dfcbe7631a Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays2kings@gmail.com>
Date: Wed, 21 Sep 2016 22:42:25 -0400
Subject: [PATCH] fixed a merge request

---
 DS4Windows/DS4Control/ScpUtil.cs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs
index 1dc23bd11d..589200b122 100644
--- 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]);