Merge pull request #191 from dingelish/master

author Mark Thom <[email protected]>

Mon, 14 Oct 2019 03:59:03 +0000 (00:59 -0300)

committer GitHub <[email protected]>

Mon, 14 Oct 2019 03:59:03 +0000 (00:59 -0300)
author Mark Thom <[email protected]>
Mon, 14 Oct 2019 03:59:03 +0000 (00:59 -0300)
committer GitHub <[email protected]>
Mon, 14 Oct 2019 03:59:03 +0000 (00:59 -0300)
diff --cc src/prolog/machine/mod.rs
Simple merge
diff --cc src/prolog/machine/system_calls.rs
Simple merge
author	Mark Thom <[email protected]>
	Mon, 14 Oct 2019 03:59:03 +0000 (00:59 -0300)
committer	GitHub <[email protected]>
	Mon, 14 Oct 2019 03:59:03 +0000 (00:59 -0300)
		1	2
src/prolog/machine/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/prolog/machine/system_calls.rs	patch \|	diff1 \|	diff2 \|	blob \| history