Change comment, fix whitespace

Author: SebastianApel

ggml.c

@@ -1974,7 +1974,15 @@ static void ggml_vec_dot_q4_0(const int n, float * restrict s, const void * rest
     // Main loop
     for (int i = 0; i < nb; i+=UNROLL_COUNT) {
 
+<<<<<<< HEAD
         // This loop will be unrolled by the compiler    
+=======
+        /* Prepare the constants we will need during execution */        
+        const __m256i lowMask = _mm256_set1_epi8( 0xF );
+        const __m256i offset_8 = _mm256_set1_epi16( 8 );
+        
+        // This loop will be unrolled by the compiler
+>>>>>>> 359be15 (Change comment, fix whitespace)
         for (int u=0;u<UNROLL_COUNT;u++)  {
             /* Compute combined scale for the block */ 
             const __m256 scale = _mm256_mul_ps( 
@@ -2034,7 +2042,7 @@ static void ggml_vec_dot_q4_0(const int n, float * restrict s, const void * rest
     res = _mm_add_ps( res, _mm256_castps256_ps128( acc ) );
     res = _mm_add_ps( res, _mm_movehl_ps( res, res ) );
     res = _mm_add_ss( res, _mm_movehdup_ps( res ) );
-   
+
     sumf = _mm_cvtss_f32( res );
 #elif defined(__AVX__)
     // Initialize accumulator with zeros