Fix merge error that disabled contact drag'n'drop

Thomas Bruederli

2014-08-19 fc52af24f1418d6590a2d37a0d8cc31b123e38f6

1
2
3
4
5
# this is a comment
# and the second line
 
require ["variables"];
set "b" "c";