Conflicts: basis/locals/locals.factor basis/peg/peg.factor extra/infix/infix.factor  | 
			||
|---|---|---|
| .. | ||
| authors.txt | ||
| interpolate-tests.factor | ||
| interpolate.factor | ||
| summary.txt | ||
| tags.txt | ||
				
					
						
							Conflicts: basis/locals/locals.factor basis/peg/peg.factor extra/infix/infix.factor  | 
			||
|---|---|---|
| .. | ||
| authors.txt | ||
| interpolate-tests.factor | ||
| interpolate.factor | ||
| summary.txt | ||
| tags.txt | ||