resolve merge conflict
authorStefan Israelsson Tampe <stefan.itampe@gmail.com>
Tue, 20 Mar 2018 16:52:27 +0000 (17:52 +0100)
committerStefan Israelsson Tampe <stefan.itampe@gmail.com>
Tue, 20 Mar 2018 16:52:27 +0000 (17:52 +0100)
commit37eac021fde1d92798a814d57afceaac1d08a31c
tree6ea651018d3cd5d702859aa8adc5ec3847168cc5
parentccb060a1e03d9c69e3d86b0f236c076832665192
parentd71244f5cb87a4a61a6b341e4838a38e50142815
resolve merge conflict
modules/language/python/compile.scm
modules/oop/pf-objects.scm