update

thomas-k-cameron · Mar 5, 2023 · e52d3d3 · e52d3d3
1 parent 6123715
commit e52d3d3
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/tools/compile_time_benchmark/src/main.rs b/tools/compile_time_benchmark/src/main.rs
@@ -75,15 +75,10 @@ async fn drop_batch_resources(client: aws_sdk_batch::Client) -> Result<(), JoinE
 }
 
 async fn submit_job(client: aws_sdk_batch::Client) {
-<<<<<<< HEAD
     if let Ok(job) = client.submit_job().send().await {
         client.submit_job().depends_on({
             JobDependency::builder().job_id(job.job_id().unwrap()).build()
         }).send().await;
     }
     let res = client.submit_job().send().await;
-=======
-    let job = client.submit_job().send().await;
-    client.submit_job().send().await;
->>>>>>> e88a79656c182a597de0e4ba3d9f590a5012d1da
 }