Skip to content

Commit cfad2b7

Browse files
committed
Fix merge conflict
1 parent 1f15dae commit cfad2b7

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

src/lib.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,7 @@ impl<L: AttestationPlatform, R: AttestationPlatform> ProxyClient<L, R> {
212212
Self {
213213
inner,
214214
connector,
215-
<<<<<<< HEAD
216-
target: target.into(),
217-
=======
218-
listener,
219215
target,
220-
>>>>>>> main
221216
target_name,
222217
}
223218
}

0 commit comments

Comments
 (0)