run

Docker/run-experiment.sh

@@ -119,15 +119,9 @@ date "+===== Start %s %F %T"
 
     if [ "$1" = "write" -a "$5" = "2P" -a "$4" = "preproc" ]; then
         # Run, saving the output
-<<<<<<< HEAD
         savefilep0=$$.p1.out
         savefilep1=$$.p0.out
         docker exec -w /root/duoram/2p-preprocessing duoram_p1 ./OT $p0addr $p1addr 1  $((128*iters*size*3))  &
-=======
-        savefilep0=$$.p0.out
-        savefilep1=$$.p1.out
-        docker exec -w /root/duoram/2p-preprocessing duoram_p1 ./OT $p0addr $p1addr 1  128 * $iters * $size &
->>>>>>> 4628c17c34e5930db2f64e662fbe9615f59af64c
         echo "P1 launched"
         sleep 1
         docker exec -w /root/duoram/2p-preprocessing duoram_p0 ./OT $p0addr $p1addr 0  $((128*iters*size*3))  &