fixed merge conflict
authorErik Haider Forsén <erikhf@ifi.uio.no>
Mon, 2 Nov 2015 09:38:49 +0000 (10:38 +0100)
committerErik Haider Forsén <erikhf@ifi.uio.no>
Mon, 2 Nov 2015 09:38:49 +0000 (10:38 +0100)
commitda2e6a2b569d789a592f8e36b892a5c7fa04f1a5
tree9c4b0c46af8e503f11a5b551f04cc7672eb01c0e
parentb1152726dabdbb3c2f3dd8279471ced847b25af7
parent36d9daeb1fcc758b0a56161934ce3d1e2656ddc7
fixed merge conflict