From 63a1b2890ba560d15d1364d8ab78e65441ba38ce Mon Sep 17 00:00:00 2001
From: Roger Ferrel <Roger.L.Ferrel@raytheon.com>
Date: Wed, 27 Aug 2014 08:45:13 -0500
Subject: [PATCH] Omaha #3567 Merge conflict VbSources.xml changes placed in
 volume.xml.

Former-commit-id: fa42c4069a73de664083659870c19ec996d64476 [formerly 474e07b299246aee4e6b214226c176c4a10aa866]
Former-commit-id: 9154ef60bb048995795a9c1b79b61e52ef0e927c
---
 .../localization/volumebrowser/VbSources/volume.xml          | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/volume.xml b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/volume.xml
index de087212f0..0bf69fb88b 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/volume.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/volume.xml
@@ -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" />