5 Commits

Author	SHA1	Message	Date
jiepeng	b8900baf1a	remove deprecated calls	2022-09-17 15:10:41 -07:00
Jesse Duffield	c8cc18920f	improve merge conflict flow	2022-01-26 14:50:47 +11:00
Jesse Duffield	ccf90466fa	fix test	2022-01-09 14:09:53 +11:00
Jesse Duffield	18f48a43d5	add some more linters	2022-01-09 14:09:53 +11:00
Jesse Duffield	c9a0cc6b30	refactor	2022-01-09 14:09:53 +11:00