Reviewer feedback: removed macros

Author: SebastianApel

ggml.c

@@ -1974,15 +1974,7 @@ 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( 
@@ -2064,7 +2056,7 @@ static void ggml_vec_dot_q4_0(const int n, float * restrict s, const void * rest
             bx = _mm_sub_epi8( bx, off );
             by = _mm_sub_epi8( by, off );
 
-	    // Get absolute values of x vectors
+	        // Get absolute values of x vectors
             const __m128i ax = _mm_sign_epi8(bx, bx);
 
             // Sign the values of the y vectors