4 commits

Author	SHA1	Message	Date
Joey Hess	f5595ea063	comment	2021-06-25 12:13:25 -04:00
Ilya_Shlyakhter	7ad95210d1	Added a comment: resolving merge conflicts	2021-06-24 18:03:40 +00:00
Lukey	fb2e418fa2	Added a comment	2021-06-24 17:43:36 +00:00
Joey Hess	e701f69ac4	comment and close	2021-06-23 12:53:18 -04:00