summaryrefslogtreecommitdiff
path: root/prolog/en.py
diff options
context:
space:
mode:
authorMartin Možina <martin.mozina@fri.uni-lj.si>2015-10-26 17:52:33 +0100
committerMartin Možina <martin.mozina@fri.uni-lj.si>2015-10-26 17:52:33 +0100
commitec7740df5a94d90758d688ac0f753e12de931360 (patch)
treebed8670411a652811c73f031611789172a6aa030 /prolog/en.py
parented5473c15bdb472219056b30850605cf7e3b9a18 (diff)
parenta1c8d26d58f24fa243864b2d386b21ec727b2c40 (diff)
Merge branch 'master' of 192.168.15.97:codeq-problems
Conflicts: python/problems/introduction/fahrenheit_to_celsius/sl.py
Diffstat (limited to 'prolog/en.py')
0 files changed, 0 insertions, 0 deletions