Fix a merge conflict

Author: alexcrichton

src/x86/avx2.rs

@@ -3,7 +3,7 @@ use v128::*;
 use x86::__m256i;
 
 #[cfg(test)]
-use assert_instr::assert_instr;
+use stdsimd_test::assert_instr;
 
 /// Computes the absolute values of packed 32-bit integers in `a`.
 #[inline(always)]

src/x86/sse41.rs

@@ -2,7 +2,7 @@ use v128::*;
 use x86::__m128i;
 
 #[cfg(test)]
-use assert_instr::assert_instr;
+use stdsimd_test::assert_instr;
 
 #[inline(always)]
 #[target_feature = "+sse4.1"]

src/x86/ssse3.rs

@@ -1,7 +1,7 @@
 use v128::*;
 
 #[cfg(test)]
-use assert_instr::assert_instr;
+use stdsimd_test::assert_instr;
 
 /// Compute the absolute value of packed 8-bit signed integers in `a` and
 /// return the unsigned results.