From ffcf8a0d7681bb5038dc00479d824d9e20f5f989 Mon Sep 17 00:00:00 2001
From: Ali Malik <mikli@amazon.com>
Date: Fri, 23 Jul 2021 19:14:28 -0400
Subject: [PATCH] Fix may not to appropriate might not or must not

---
 library/core/src/iter/adapters/zip.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/library/core/src/iter/adapters/zip.rs b/library/core/src/iter/adapters/zip.rs
index 1eb5fa5c45f2..c7e69e922c13 100644
--- a/library/core/src/iter/adapters/zip.rs
+++ b/library/core/src/iter/adapters/zip.rs
@@ -470,7 +470,6 @@ impl<A: Debug + TrustedRandomAccessNoCoerce, B: Debug + TrustedRandomAccessNoCoe
 ///
 /// The iterator's `size_hint` must be exact and cheap to call.
 ///
-<<<<<<< HEAD
 /// `TrustedRandomAccessNoCoerce::size` may not be overridden.
 ///
 /// All subtypes and all supertypes of `Self` must also implement `TrustedRandomAccess`.
@@ -481,9 +480,6 @@ impl<A: Debug + TrustedRandomAccessNoCoerce, B: Debug + TrustedRandomAccessNoCoe
 ///
 /// If `Self: ExactSizeIterator` then `self.len()` must always produce results consistent
 /// with `self.size()`.
-=======
-/// `size` must not be overridden.
->>>>>>> Fix may not to appropriate might not or must not
 ///
 /// If `Self: Iterator`, then `<Self as Iterator>::__iterator_get_unchecked(&mut self, idx)`
 /// must be safe to call provided the following conditions are met.