Sean McGivern 4743d19463 Simplify conflict file JSON creation		2016-10-13 14:16:34 -05:00
..
file.rb	Simplify conflict file JSON creation	2016-10-13 14:16:34 -05:00
file_collection.rb	Allow setting content for resolutions	2016-10-13 14:16:34 -05:00
parser.rb	Allow setting content for resolutions	2016-10-13 14:16:34 -05:00
resolution_error.rb	Allow setting content for resolutions	2016-10-13 14:16:34 -05:00