merge

Author: AliceLanniste

src/mem/skiplist.rs

@@ -266,10 +266,6 @@ pub struct SkiplistIterator<C: Comparator, A: Arena> {
 }
 
 impl<C: Comparator, A: Arena> Iterator for SkiplistIterator<C, A> {
-<<<<<<< HEAD
-
-=======
->>>>>>> remove unnecessary information
     type Key = Slice;
     type Value = Slice;
     /// Returns true whether the iterator is positioned at a valid node

src/sstable/block.rs

@@ -218,10 +218,6 @@ impl<C: Comparator> BlockIterator<C> {
 }
 
 impl<C: Comparator> Iterator for BlockIterator<C> {
-<<<<<<< HEAD
-
-=======
->>>>>>> fix conflict changes
     type Key = Slice;
     type Value = Slice;
     #[inline]

src/sstable/mod.rs

@@ -661,17 +661,11 @@ mod tests {
     }
 
     impl Iterator for EntryIterator {
-<<<<<<< HEAD
 
         type Key = Slice;
         type Value = Slice;
 
 
-=======
-        type Key = Slice;
-        type Value = Slice;
-
->>>>>>> remove unnecessary information
         fn valid(&self) -> bool {
             self.current < self.data.len()
         }