Merge "Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml." into omaha_14.4.1

Former-commit-id: 6f66071eca [formerly f7aa38e6092e59e314fedad22829eed9e5c22ad2]
Former-commit-id: 40917b6118
This commit is contained in:
Richard Peter 2014-09-02 09:23:58 -05:00 committed by Gerrit Code Review
commit 59ad20bac3

View file

@ -29,11 +29,16 @@
<vbSource key="ECMWF-HiRes" category="Volume" />
<vbSource key="ECMF-NorthernHemisphere" category="Volume" />
<vbSource key="GFS212" category="Volume" />
<!-- Old version being replaced by GFS229
<vbSource key="AVN225" category="Volume" />
<vbSource key="GFS213" category="Volume" />
<vbSource key="MRF204" category="Volume" />
<vbSource key="MRF205" category="Volume" />
-->
<vbSource key="GFS229" category="Volume" />
<!-- Old version being replaced by GFS229
<vbSource key="AVN203" category="Volume" />
-->
<vbSource key="GFS201" category="Volume" />
<vbSource key="GEFS" category="Volume" />
<vbSource key="ENSEMBLE" category="Volume" views="PLANVIEW TIMESERIES" />