3 Commits

Author	SHA1	Message	Date
Daniel Nelson	2a465cc687	Use merge=union driver for go.sum	2020-03-16 10:02:49 -07:00
Cameron Sparr	fb5f40319e	update gitattributes for easier fork mngmnt	2016-06-01 16:18:17 +01:00
Cameron Sparr	1b083d63ab	add gitattributes file	2016-04-22 11:42:22 -06:00