merge with master

author Mark Thom <[email protected]>

Fri, 20 Dec 2019 00:04:30 +0000 (20:04 -0400)

committer Mark Thom <[email protected]>

Fri, 20 Dec 2019 00:04:30 +0000 (20:04 -0400)
author Mark Thom <[email protected]>
Fri, 20 Dec 2019 00:04:30 +0000 (20:04 -0400)
committer Mark Thom <[email protected]>
Fri, 20 Dec 2019 00:04:30 +0000 (20:04 -0400)
diff --cc src/prolog/clause_types.rs
Simple merge
diff --cc src/prolog/machine/system_calls.rs
Simple merge
author	Mark Thom <[email protected]>
	Fri, 20 Dec 2019 00:04:30 +0000 (20:04 -0400)
committer	Mark Thom <[email protected]>
	Fri, 20 Dec 2019 00:04:30 +0000 (20:04 -0400)
		1	2
src/prolog/clause_types.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/prolog/machine/system_calls.rs	patch \|	diff1 \|	diff2 \|	blob \| history