Merge "Issue #189 fix bad merging of D2DGridDatabase" into Unified_Grid

Former-commit-id: 9f623f700c [formerly dc31187b81] [formerly a659be2f2d] [formerly 9f623f700c [formerly dc31187b81] [formerly a659be2f2d] [formerly b129c01c00 [formerly a659be2f2d [formerly f352ad66b867aa62981eb0feb25359cba89c87a2]]]]
Former-commit-id: b129c01c00
Former-commit-id: d65f12a232 [formerly f7b3cbdef7] [formerly 3e489d14d6d33fdbe6c455837f5c1583b6aba06e [formerly 35ed6c1e5f]]
Former-commit-id: 1eadaae69abbd3196b8f4046351833d760908bbf [formerly e5111b0979]
Former-commit-id: ad6fbe2238
This commit is contained in:
Richard Peter 2012-10-19 11:13:43 -05:00 committed by Gerrit Code Review
commit a3f3d527f1

View file

@ -121,7 +121,7 @@ public class D2DGridDatabase extends VGridDatabase {
if (valid) {
loadParms();
outputLoc = this.config.dbDomain();
}
}