Fix merge conflict.
authorBen Thompson <ben@xtuple.com>
Fri, 24 May 2013 22:40:31 +0000 (18:40 -0400)
committerBen Thompson <ben@xtuple.com>
Fri, 24 May 2013 22:40:31 +0000 (18:40 -0400)
commitf50f4b04236002017addb88ca6a76a86d6c5c7fd
treebd571672ab4334800b7f327f7094905019bb2040
parent5b7ba956fd123d51fbd471d2ba2b21f3f83e3536
parent7752b8829cbcca48c856c727c71847353fcd4b66
Fix merge conflict.
lib/orm/source/xt/javascript/data.sql
lib/orm/source/xt/javascript/session.sql
node-datasource/main.js
node-datasource/sample_config.js