update

thomas-k-cameron · thomas-k-cameron · commit e52d3d312ce3 · 2023-03-05T20:56:29.000Z
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
 }

Original file line number	Diff line number	Diff line change
`@@ -75,15 +75,10 @@ async fn drop_batch_resources(client: aws_sdk_batch::Client) -> Result<(), JoinE`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`async fn submit_job(client: aws_sdk_batch::Client) {`
`78`		`-<<<<<<< HEAD`
`79`	`78`	`if let Ok(job) = client.submit_job().send().await {`
`80`	`79`	`client.submit_job().depends_on({`
`81`	`80`	`JobDependency::builder().job_id(job.job_id().unwrap()).build()`
`82`	`81`	`}).send().await;`
`83`	`82`	`}`
`84`	`83`	`let res = client.submit_job().send().await;`
`85`		`-=======`
`86`		`- let job = client.submit_job().send().await;`
`87`		`- client.submit_job().send().await;`
`88`		`->>>>>>> e88a79656c182a597de0e4ba3d9f590a5012d1da`
`89`	`84`	`}`