Conflicts: basis/xmode/utilities/utilities-tests.factor  | 
			||
|---|---|---|
| .. | ||
| authors.txt | ||
| catalog-tests.factor | ||
| catalog.factor | ||
				
					
						
							Conflicts: basis/xmode/utilities/utilities-tests.factor  | 
			||
|---|---|---|
| .. | ||
| authors.txt | ||
| catalog-tests.factor | ||
| catalog.factor | ||