7 Commits

Author	SHA1	Message	Date
Arya Irani	1d0ab1d4f3	Merge remote-tracking branch 'origin/trunk' into arya/ooo-sync ... # Conflicts: # hie.yaml # parser-typechecker/package.yaml # unison-hashing-v2/package.yaml # unison-hashing-v2/unison-hashing-v2.cabal	2022-06-16 15:06:42 -04:00
Arya Irani	0437ca0c74	remove haskeline fork ... resolves https://github.com/unisonweb/unison/pull/1836 closes https://github.com/judah/haskeline/pull/115	2022-06-15 11:54:25 -04:00
Mitchell Rosen	45c135cc89	⅄ trunk → arya/ooo-sync	2022-06-10 18:30:29 -04:00
Mitchell Rosen	12e1c778b3	minor sql improvements	2022-06-10 16:57:01 -04:00
Travis Staton	784a524432	Bump megaparsec dependency	2022-06-03 12:02:56 -04:00
Arya Irani	0a53bd1c4f	forgot to include stack.yaml.lock	2022-04-30 22:30:40 -04:00
Chris Penner	1eaebf3709	Commit stack.yaml.lock as is recommended. ... https://docs.haskellstack.org/en/stable/lock_files	2022-03-31 15:23:49 -06:00