Remove conflicts checked in earlier

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@822225 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 0 insertions, 17 deletions

diff --git a/qpid/cpp/src/tests/run_header_test.ps1 b/qpid/cpp/src/tests/run_header_test.ps1
index df778a05a1..c7bc2d788e 100644
--- a/qpid/cpp/src/tests/run_header_test.ps1
+++ b/qpid/cpp/src/tests/run_header_test.ps1
@@ -21,7 +21,6 @@
 # TODO: this should be expanded to cover a wider set of types and go
 # in both directions
 
-<<<<<<< .mine
 $srcdir = Split-Path $myInvocation.InvocationName
 $PYTHON_DIR = "$srcdir\..\..\..\python"
 if (!(Test-Path $PYTHON_DIR -pathType Container)) {
@@ -29,15 +28,10 @@ if (!(Test-Path $PYTHON_DIR -pathType Container)) {
     exit 0
 }
 
-=======
-$srcdir = Split-Path $myInvocation.InvocationName
-$PYTHON_DIR = "$srcdir\..\..\..\python"
->>>>>>> .r822090
 if (Test-Path qpidd.port) {
    set-item -path env:QPID_PORT -value (get-content -path qpidd.port -totalcount 1)
 }
 
-<<<<<<< .mine
 # Test runs from the tests directory but the test executables are in a
 # subdirectory based on the build type. Look around for it before trying
 # to start it.
@@ -47,24 +41,13 @@ foreach ($sub in $subs) {
   if (Test-Path $prog) {
      break
   }
-=======
-if (Test-Path $PYTHON_DIR -pathType Container) {
-    Invoke-Expression "$env:OUTDIR\header_test -p $env:QPID_PORT"
-    $env:PYTHONPATH="$PYTHON_DIR;$env:PYTHONPATH"
-    python "$srcdir/header_test.py" "localhost" "$env:QPID_PORT"
-    exit $LASTEXITCODE
->>>>>>> .r822090
 }
 if (!(Test-Path $prog)) {
     "Cannot locate header_test.exe"
     exit 1
 }
-<<<<<<< .mine
 
 Invoke-Expression "$prog -p $env:QPID_PORT" | Write-Output
 $env:PYTHONPATH="$PYTHON_DIR;$env:PYTHONPATH"
 Invoke-Expression "python $srcdir/header_test.py localhost $env:QPID_PORT" | Write-Output
 exit $LASTEXITCODE
-
-=======
->>>>>>> .r822090