4 Commits

Author	SHA1	Message	Date
Henry Whitney	337ffa802b	Resolve conflict	2019-07-08 14:59:10 -04:00
Henry Whitney	af12946cd8	Conform file to have EOL at end	2019-06-13 12:08:18 -04:00
Susan Quigley	02507151f9	Update 'jit/figs-metaphorparts/title.md' ... Title was missing the word "of."	2019-06-11 17:46:09 +00:00
David Statezni	bb353c59d2	Update merge conflicts	2019-02-05 09:38:00 -07:00