Permalink
Browse files

fixed a merge request

  • Loading branch information...
1 parent 547bd7b commit 5b874906446ef216a8b8cb2d1c8eb9dfcbe7631a @Jays2Kings committed Sep 22, 2016
Showing with 0 additions and 8 deletions.
  1. +0 −8 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]);

0 comments on commit 5b87490

Please sign in to comment.