remove merge artifact

tox.ini

@@ -19,7 +19,6 @@ deps=
     nose
     mock<1.1  # last supported version for py26
 
-<<<<<<< HEAD
 [testenv:py27-subprocess]
 changedir=.
 basepython=python2.7
@@ -29,8 +28,6 @@ deps=pytest-xdist
 commands=
   py.test -n3 -rfsxX --runpytest=subprocess {posargs:testing}
 
-=======
->>>>>>> pytest-2.7
 [testenv:genscript]
 commands= py.test --genscript=pytest1
 
@@ -80,7 +77,7 @@ commands=
 
 [testenv:py34-trial]
 # py34-trial does not work
-platform=linux|darwin  
+platform=linux|darwin
 deps={[testenv:py27-trial]deps}
 commands=
   py.test -rsxf {posargs:testing/test_unittest.py}
@@ -126,7 +123,7 @@ commands=
     {envpython} install_cx_freeze.py
     {envpython} runtests_setup.py build --build-exe build
     {envpython} tox_run.py
-    
+
 
 [testenv:coveralls]
 passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH