Sean McGivern a1c7961217 Handle multiple merge conflict files in collection		2016-08-12 23:24:43 +03:00
..
file.rb
file_collection.rb	Handle multiple merge conflict files in collection	2016-08-12 23:24:43 +03:00
parser.rb