Jeremy Apthorp 20a540e680 chore: add explanation to resource_file_conflict.patch (#15612) ... * chore: add explanation to resource_file_conflict.patch * Update resource_file_conflict.patch		2018-11-07 11:11:01 -04:00
..
common	chore: add explanation to resource_file_conflict.patch (#15612)	2018-11-07 11:11:01 -04:00
mips64el	chore: avoid appending git version to the exported patches (#15389)	2018-10-26 12:52:59 +05:30