diff --git a/component/xorg/buildout.cfg b/component/xorg/buildout.cfg
index 4509d637126bd621d237c0d20cff19c2c1812ae8..edc919ff94c7b4030ce8f66c67fb5d3eeb32dfa5 100644
--- a/component/xorg/buildout.cfg
+++ b/component/xorg/buildout.cfg
@@ -466,4 +466,3 @@ environment =
   CPPFLAGS=-I${xproto:location}/include -I${pixman:location}/include/pixman-1 -I${xextproto:location}/include -I${inputproto:location}/include -I${fontsproto:location}/include -I${kbproto:location}/include -I${xineramaproto:location}/include -I${renderproto:location}/include -I${bigreqsproto:location}/include -I${videoproto:location}/include -I${resourceproto:location}/include -I${xcmiscproto:location}/include -I${xtrans:location}/include -I${libXau:location}/include -I${randrproto:location}/include -I${libxkbfile:location}/include -I${recordproto:location}/include -I${fixesproto:location}/include -I${damageproto:location}/include
   PATH=${pkgconfig:location}/bin:%(PATH)s
   LDFLAGS=-Wl,-rpath,${openssl:location}/lib
->>>>>>> origin/master