summaryrefslogtreecommitdiff
path: root/modules/language/python/number.scm
diff options
context:
space:
mode:
authorStefan Israelsson Tampe <stefan.itampe@gmail.com>2018-03-20 17:52:27 +0100
committerStefan Israelsson Tampe <stefan.itampe@gmail.com>2018-03-20 17:52:27 +0100
commit37eac021fde1d92798a814d57afceaac1d08a31c (patch)
tree6ea651018d3cd5d702859aa8adc5ec3847168cc5 /modules/language/python/number.scm
parentccb060a1e03d9c69e3d86b0f236c076832665192 (diff)
parentd71244f5cb87a4a61a6b341e4838a38e50142815 (diff)
resolve merge conflict
Diffstat (limited to 'modules/language/python/number.scm')
0 files changed, 0 insertions, 0 deletions