merge conflict

src/neo/IO/Caching/HashSetCache.cs

@@ -6,9 +6,18 @@ namespace Neo.IO.Caching
 {
     public class HashSetCache<T> : IReadOnlyCollection<T> where T : IEquatable<T>
     {
+        /// <summary>
+        /// Sets where the Hashes are stored
+        /// </summary>      
+        private readonly LinkedList<HashSet<T>> sets = new LinkedList<HashSet<T>>();
+        /// <summary>
+        /// Maximum capacity of each bucket inside each HashSet of <see cref="sets"/>.
+        /// </summary>        
         private readonly int bucketCapacity;
+        /// <summary>
+        /// Maximum number of buckets for the LinkedList, meaning its maximum cardinality.
+        /// </summary>
         private readonly int maxBucketCount;
-        private readonly LinkedList<HashSet<T>> sets = new LinkedList<HashSet<T>>();
 
         public int Count
         {