6 commits

Author	SHA1	Message	Date
Martin Kristiansen	537ae2f901	Resolving merge conflicts for flake8	2023-08-18 15:52:04 +10:00
Martin Kristiansen	218b6d0546	Apply black	2023-07-27 10:54:01 -04:00
Lincoln Stein	ec7c2f07c6	model merge backend, CLI and TUI working	2023-07-06 12:21:42 -04:00
Lincoln Stein	44400d2a66	fix incorrect import of merge code	2023-03-03 01:07:31 -05:00
Lincoln Stein	60a98cacef	all vestiges of ldm.invoke removed	2023-03-03 01:02:00 -05:00
Lincoln Stein	6a990565ff	all files migrated; tweaks needed	2023-03-03 00:02:15 -05:00