4 Commits

Author	SHA1	Message	Date
Henry Whitney	388ba3ef34	fix test	2019-10-03 13:27:22 -04:00
Henry Whitney	ec8c40a807	test	2019-10-03 13:17:01 -04:00
Henry Whitney	af12946cd8	Conform file to have EOL at end	2019-06-13 12:08:18 -04:00
David Statezni	bb353c59d2	Update merge conflicts	2019-02-05 09:38:00 -07:00