Fixed build error #190

glm/detail/func_common.hpp

@@ -170,7 +170,7 @@ namespace glm
 	/// @tparam genType Floating-point or integer; scalar or vector types.
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/min.xml">GLSL min man page</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a><<<<<<< HEAD
+	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
 	template <typename genType>
 	GLM_FUNC_DECL genType min(
 		genType const & x,

glm/detail/intrinsic_geometric.inl

@@ -48,11 +48,8 @@ GLM_FUNC_QUALIFIER __m128 sse_dst_ps(__m128 p0, __m128 p1)
 //dot
 GLM_FUNC_QUALIFIER __m128 sse_dot_ps(__m128 v1, __m128 v2)
 {
-<<<<<<< HEAD
+
 #	if(GLM_ARCH & GLM_ARCH_AVX)
-=======
-#   if((GLM_ARCH & GLM_ARCH_AVX) == GLM_ARCH_AVX)
->>>>>>> 0.9.5
 		return _mm_dp_ps(v1, v2, 0xff);
 #	else
 		__m128 mul0 = _mm_mul_ps(v1, v2);