Update Item.js
This commit is contained in:
		
							parent
							
								
									92624afbff
								
							
						
					
					
						commit
						fd3c346676
					
				@ -459,7 +459,7 @@ export class Item extends AbstractStruct {
 | 
				
			|||||||
        // Let c in conflictingItems, b in itemsBeforeOrigin
 | 
					        // Let c in conflictingItems, b in itemsBeforeOrigin
 | 
				
			||||||
        // ***{origin}bbbb{this}{c,b}{c,b}{o}***
 | 
					        // ***{origin}bbbb{this}{c,b}{c,b}{o}***
 | 
				
			||||||
        // Note that conflictingItems is a subset of itemsBeforeOrigin
 | 
					        // Note that conflictingItems is a subset of itemsBeforeOrigin
 | 
				
			||||||
        while (o !== null && o !== this.right) {
 | 
					        while (o != null && o !== this.right) {
 | 
				
			||||||
          itemsBeforeOrigin.add(o)
 | 
					          itemsBeforeOrigin.add(o)
 | 
				
			||||||
          conflictingItems.add(o)
 | 
					          conflictingItems.add(o)
 | 
				
			||||||
          if (compareIDs(this.origin, o.origin)) {
 | 
					          if (compareIDs(this.origin, o.origin)) {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user