fix rebase conflict xml,txt files

wmo-im · Jun 26, 2024 · 9e6a6f0 · 9e6a6f0
1 parent 904b66a
commit 9e6a6f0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/txt/CodeFlag.txt b/txt/CodeFlag.txt
@@ -2173,6 +2173,10 @@ Code table 4.101 - Type of relationship to reference dataset,,21,,Shift of Tails
 Code table 4.101 - Type of relationship to reference dataset,,22,,Anomaly of probabilities,(see Note 5),148,,Operational
 Code table 4.101 - Type of relationship to reference dataset,,23,,Standardized Drought Index,(see Note 6),147,,Operational
 Code table 4.101 - Type of relationship to reference dataset,,24-191,,Reserved,,,,Operational
+Code table 4.101 - Type of relationship to reference dataset,,22,,Anomaly of probabilities,(see Note 5),226a,,Operational
+Code table 4.101 - Type of relationship to reference dataset,,23,,Standardized Drought Index,(see Note 6),221b,,Operational
+Code table 4.101 - Type of relationship to reference dataset,,24,,Crossing Point Forecast (CPF) (see Note 7),248a,,Operational,
+Code table 4.101 - Type of relationship to reference dataset,,25-191,,Reserved,,,,Operational
 Code table 4.101 - Type of relationship to reference dataset,,192-254,,Reserved for local use,,,,Operational
 Code table 4.101 - Type of relationship to reference dataset,,255,,Missing,,,,Operational
 Code table 4.102 - Statistical processing of reference period,,0,,Average,,,,Operational

diff --git a/xml/CodeFlag.xml b/xml/CodeFlag.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<dataroot xmlns:od="urn:schemas-microsoft-com:officedata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" generated="2024-06-24T22:11:28.627951">
 	<GRIB2_CodeFlag_en>
 		<Title_en>Code table 0.0 - Discipline of processed data in the GRIB message, number of GRIB Master table</Title_en>
 		<CodeFlag>0</CodeFlag>
@@ -13039,7 +13040,13 @@
 	</GRIB2_CodeFlag_en>
 	<GRIB2_CodeFlag_en>
 		<Title_en>Code table 4.101 - Type of relationship to reference dataset</Title_en>
-		<CodeFlag>24-191</CodeFlag>
+		<CodeFlag>24</CodeFlag>
+		<MeaningParameterDescription_en>Crossing Point Forecast (CPF) (see Note 7)</MeaningParameterDescription_en>
+		<Status/>
+	</GRIB2_CodeFlag_en>
+	<GRIB2_CodeFlag_en>
+		<Title_en>Code table 4.101 - Type of relationship to reference dataset</Title_en>
+		<CodeFlag>25-191</CodeFlag>
 		<MeaningParameterDescription_en>Reserved</MeaningParameterDescription_en>
 		<Status>Operational</Status>
 	</GRIB2_CodeFlag_en>

diff --git a/xml/Template.xml b/xml/Template.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<dataroot xmlns:od="urn:schemas-microsoft-com:officedata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" generated="2024-06-24T22:11:28.627951">
 	<GRIB2_Template_en>
 		<Title_en>Identification template 1.0 - calendar definition</Title_en>
 		<OctetNo>24</OctetNo>