tests: jd-desp-d3: Fix skipping command

Fixed test skipping bug on non SDW platforms,
if the usbrelay module is not installed.

Signed-off-by: Artur Wilczak <arturx.wilczak@intel.com>

Author: arikgreen

test-case/test-jack-detection-dsp-d3.sh

@@ -168,24 +168,13 @@ main()
     start_test
 
     dlogi "Checking usbrelay availability..."
-<<<<<<< HEAD
-    if ! command -v usbrelay > /dev/null; then
-        # If usbrelay package is not installed
-        skip_test "usbrelay command not found."
-    fi
-
-    if ! usbrelay_switch --debug > /dev/null; then
-        skip_test "Failed to get usbrelay status."
-    fi
-=======
     command -v usbrelay || {
         # If usbrelay package is not installed
         skip_test "usbrelay command not found."
     }
     usbrelay_switch --debug || {
         skip_test "Failed to get usbrelay status."
     }
->>>>>>> 628f54d (Fix skippng)
 
     dlogi "Reset USB Relay - plug jack audio."
     usbrelay_switch "$relay" 0