Merge branch 'master' of http://github.com/mthom/rusty-wam

author Mark Thom <[email protected]>

Thu, 3 May 2018 23:37:12 +0000 (17:37 -0600)

committer Mark Thom <[email protected]>

Thu, 3 May 2018 23:37:12 +0000 (17:37 -0600)
author Mark Thom <[email protected]>
Thu, 3 May 2018 23:37:12 +0000 (17:37 -0600)
committer Mark Thom <[email protected]>
Thu, 3 May 2018 23:37:12 +0000 (17:37 -0600)
diff --cc src/prolog/machine/machine_errors.rs
Simple merge
diff --cc src/prolog/machine/machine_state_impl.rs
Simple merge
author	Mark Thom <[email protected]>
	Thu, 3 May 2018 23:37:12 +0000 (17:37 -0600)
committer	Mark Thom <[email protected]>
	Thu, 3 May 2018 23:37:12 +0000 (17:37 -0600)
		1	2
src/prolog/machine/machine_errors.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/prolog/machine/machine_state_impl.rs	patch \|	diff1 \|	diff2 \|	blob \| history