fix merge conflicts
authorgaryhgohoos <gary@xtuple.com>
Thu, 28 Aug 2014 17:29:29 +0000 (13:29 -0400)
committergaryhgohoos <gary@xtuple.com>
Thu, 28 Aug 2014 17:29:29 +0000 (13:29 -0400)
commit2945e8f704e976bd36b2fc9fc70891f082949763
treee88ad9fa8bf04464d7ac9133e3d72cdc60aeb3bd
parent24d0cbb90bbb17c16940ca734c7cce8bad8fdce5
parent07b6934753b3b7f777c12b1963e9b04089ea55bc
fix merge conflicts
foundation-database/manifest.js
foundation-database/public/functions/balanceitemsite.sql
foundation-database/public/tables/metasql/salesOrderItems-list.mql
foundation-database/public/tables/setVersion.sql