merge conflict

[xtuple] / foundation-database / manifest.js

diff --git a/foundation-database/manifest.js b/foundation-database/manifest.js
index 738dddb..34aa9af 100644 (file)
--- a/foundation-database/manifest.js
+++ b/foundation-database/manifest.js
@@ -1015,6 +1015,7 @@
     "public/tables/bankrecitem.sql",
     "public/tables/cashrcpt.sql",
     "public/tables/ccpay.sql",
+    "public/tables/ccbank.sql",
     "public/tables/checkhead.sql",
     "public/tables/metric.sql",
     "public/tables/payco.sql",