Fix merge conflict.
authorBen Thompson <ben@xtuple.com>
Tue, 20 May 2014 18:02:06 +0000 (14:02 -0400)
committerBen Thompson <ben@xtuple.com>
Tue, 20 May 2014 18:02:06 +0000 (14:02 -0400)
commit60aee6185dc0033a0352e34a71b8c7725fcbc462
tree0eba0289405e17ef78c9d48b4a1e117520659d73
parent3b5d36031d0d9d0822997b674d48ec7fb918b7e1
parent35cc68ec830f5ca7cd8e5828b3aa335e1678386b
Fix merge conflict.
foundation-database/manifest.js